Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 12 Mar 2012 22:06:31 +0000 (23:06 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 12 Mar 2012 22:06:31 +0000 (23:06 +0100)

Trivial merge