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

Trivial merge