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

Trivial merge