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)

Trivial merge