Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jan 2014 10:40:00 +0000 (11:40 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jan 2014 10:40:00 +0000 (11:40 +0100)

Trivial merge