Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 21:53:09 +0000 (22:53 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 31 Jan 2015 21:53:09 +0000 (22:53 +0100)

Trivial merge