Merge branch 'release' into testserver-stable
authorMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 20:08:29 +0000 (22:08 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 20:08:29 +0000 (22:08 +0200)

Trivial merge