Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 28 Dec 2011 16:05:47 +0000 (17:05 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 28 Dec 2011 16:05:47 +0000 (17:05 +0100)

Trivial merge