Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 27 Dec 2014 11:47:11 +0000 (12:47 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 27 Dec 2014 11:47:11 +0000 (12:47 +0100)

Trivial merge