Merge branch 'release' into signer
authorMichael Tänzer <neo@nhng.de>
Tue, 9 Apr 2013 22:03:19 +0000 (00:03 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 9 Apr 2013 22:03:19 +0000 (00:03 +0200)

Trivial merge