Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 27 Feb 2012 16:15:03 +0000 (17:15 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 27 Feb 2012 16:15:03 +0000 (17:15 +0100)

Trivial merge