Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 29 Dec 2014 23:21:52 +0000 (00:21 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 29 Dec 2014 23:21:52 +0000 (00:21 +0100)

Trivial merge