Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 30 Dec 2011 02:44:24 +0000 (03:44 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 30 Dec 2011 02:44:24 +0000 (03:44 +0100)

Trivial merge