Merge branch 'bug-1218' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 15:50:30 +0000 (16:50 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 15:50:30 +0000 (16:50 +0100)

Trivial merge