Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 10 Feb 2012 19:56:16 +0000 (20:56 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 10 Feb 2012 19:56:16 +0000 (20:56 +0100)

Trivial merge