Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 14 Dec 2014 15:37:46 +0000 (16:37 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 14 Dec 2014 15:37:46 +0000 (16:37 +0100)

Trivial merge