Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 21 Feb 2012 20:53:51 +0000 (21:53 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 21 Feb 2012 20:53:51 +0000 (21:53 +0100)

Trivial merge