Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 2 Mar 2015 10:42:07 +0000 (11:42 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 2 Mar 2015 10:42:07 +0000 (11:42 +0100)

Trivial merge