Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 9 Feb 2012 13:46:32 +0000 (14:46 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 9 Feb 2012 13:46:32 +0000 (14:46 +0100)

Trivial merge