Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 29 May 2014 21:54:31 +0000 (23:54 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 29 May 2014 21:54:31 +0000 (23:54 +0200)

Trivial merge