Merge remote-tracking branch 'origin/bug-827' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 6 Sep 2011 15:27:43 +0000 (17:27 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 6 Sep 2011 15:27:43 +0000 (17:27 +0200)
commitb9c3f59c9330d2fc2702eff46030d54300f89707
treef296a58d9fbe0e1d67edf60d2d1658ba804b8541
parent12e0f5032caadb166eaa8a1cd1a5ea6136d662f2
parent32b9c96fa2216ce8a8a0ae8a8ea1defe18d67b67
Merge remote-tracking branch 'origin/bug-827' into release