Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 11 Mar 2015 10:33:39 +0000 (11:33 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 11 Mar 2015 10:33:39 +0000 (11:33 +0100)

Trivial merge