Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 2 Mar 2015 14:21:40 +0000 (15:21 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 2 Mar 2015 14:21:40 +0000 (15:21 +0100)

Trivial merge