Merge remote-tracking branch 'origin/bug-948' into release 2011-07-21
authorMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 13:15:08 +0000 (15:15 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 21 Jul 2011 13:15:08 +0000 (15:15 +0200)
commit18e174650de0aecc446d51eec3e0801e3edefcad
tree534ecfcd2675fedb027fc1fa3c3e8a67a1fd068e
parenta9cf76bebbae1d26b558f55daf6fa59ebfda91b1
parent3d6c4ebbebd10e6ab6c2e952b07a6eea2f0a5626
Merge remote-tracking branch 'origin/bug-948' into release