Merge branch 'bug-827' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 15 Nov 2011 22:07:11 +0000 (23:07 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 15 Nov 2011 22:07:11 +0000 (23:07 +0100)
commit76a6feac6985a45ea984c30a8d3bf2a48ce21bb7
tree29b9d47f042521142b8d6445f9c39f41f067008b
parent10aaf4480a5182377df284f2cc1cb3a43cf4c891
parent954f554feccb856f840680709812f43f5a0d83c9
Merge branch 'bug-827' into release