Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 6 Dec 2012 21:27:12 +0000 (22:27 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 6 Dec 2012 21:27:12 +0000 (22:27 +0100)

Trivial merge