Merge remote-tracking branch 'origin/bug-1236' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:06:56 +0000 (00:06 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:06:56 +0000 (00:06 +0100)

Trivial merge