Merge branch 'bug-1099' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 16:36:49 +0000 (18:36 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 16:36:49 +0000 (18:36 +0200)
commitceb333fa0d4494fe161760e76c63787287819a2a
treea4d7a1d7e94d0cb072f6e4ec29a4bfaeb778315a
parentef6fa684e0c1ac2155036cc2981c65482de92bfc
parente25254b26799d575a9569c4bb6855adf58951db5
Merge branch 'bug-1099' into release