Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 9 Feb 2015 09:58:15 +0000 (10:58 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 9 Feb 2015 09:58:15 +0000 (10:58 +0100)

Trivial merge