Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 24 Nov 2014 22:50:34 +0000 (23:50 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 24 Nov 2014 22:50:34 +0000 (23:50 +0100)

Trivial merge