Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 5 Dec 2014 01:24:39 +0000 (02:24 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 5 Dec 2014 01:24:39 +0000 (02:24 +0100)

Trivial merge