Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 19 Mar 2015 12:10:14 +0000 (13:10 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 19 Mar 2015 12:10:14 +0000 (13:10 +0100)

Trivial merge