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

Trivial merge