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

Trivial merge