Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 8 Feb 2012 19:55:40 +0000 (20:55 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 8 Feb 2012 19:55:40 +0000 (20:55 +0100)

Trivial merge