Merge branch 'bug-882' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 15 Nov 2011 22:07:24 +0000 (23:07 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 15 Nov 2011 22:07:24 +0000 (23:07 +0100)
commit9feddd1e1f31d52a0bb4fcb5c8c0e1871ff42c25
treee6ed54b2fcde87b8de397cdf4106af91127db44d
parent76a6feac6985a45ea984c30a8d3bf2a48ce21bb7
parent27eb6fe8c3b4adb3a101afbdc3ff7dc63b24c98e
Merge branch 'bug-882' into release