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

Trivial merge