Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Feb 2014 20:39:30 +0000 (21:39 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Feb 2014 20:39:30 +0000 (21:39 +0100)

Trivial merge