Merge remote-tracking branch 'origin/bug-440' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:25:47 +0000 (01:25 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:25:47 +0000 (01:25 +0100)
commit3213ce91971fd5976a1f31b0c24a822c01591911
tree8971ced37d9004453950c2a7ee1d8531ccba5a57
parentbc5cb72198019f4b27aa8e11b250c65cc8ca5717
parente525adb1fcd467f68b9d6f3b685f6736ad8e7b09
Merge remote-tracking branch 'origin/bug-440' into release