Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 11 Apr 2015 20:10:08 +0000 (22:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 11 Apr 2015 20:10:08 +0000 (22:10 +0200)

Trivial merge