Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 8 Feb 2012 13:39:42 +0000 (14:39 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 8 Feb 2012 13:39:42 +0000 (14:39 +0100)

Trivial merge