Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 7 Mar 2015 15:12:49 +0000 (16:12 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 7 Mar 2015 15:12:49 +0000 (16:12 +0100)

Trivial merge