Merge branch 'release' into bug-1017
authorMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 20:56:25 +0000 (22:56 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 20:56:25 +0000 (22:56 +0200)

Trivial merge