Merge branch 'bug-1004' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 12:53:38 +0000 (13:53 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 12:53:38 +0000 (13:53 +0100)

Trivial merge