Merge remote-tracking branch 'origin/bug-1288' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 4 Dec 2014 21:50:46 +0000 (22:50 +0100)
committerMichael Tänzer <neo@nhng.de>
Thu, 4 Dec 2014 21:50:46 +0000 (22:50 +0100)

Trivial merge