Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 14 Jul 2011 18:09:43 +0000 (20:09 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 14 Jul 2011 18:09:43 +0000 (20:09 +0200)

Trivial merge