Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 5 Jan 2012 21:54:51 +0000 (22:54 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 5 Jan 2012 21:54:51 +0000 (22:54 +0100)

Trivial merge