Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 2 Feb 2015 16:47:49 +0000 (17:47 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 2 Feb 2015 16:47:49 +0000 (17:47 +0100)

Trivial merge