Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2011 19:06:50 +0000 (21:06 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2011 19:06:50 +0000 (21:06 +0200)

Trivial merge