Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 10 Mar 2014 17:20:32 +0000 (18:20 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 10 Mar 2014 17:20:32 +0000 (18:20 +0100)

Trivial merge