Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 10 Apr 2014 11:35:13 +0000 (13:35 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 10 Apr 2014 11:35:13 +0000 (13:35 +0200)

Trivial merge