Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 17 Apr 2014 15:07:50 +0000 (17:07 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 17 Apr 2014 15:07:50 +0000 (17:07 +0200)

Trivial merge