Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 25 Jul 2011 17:44:41 +0000 (19:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 25 Jul 2011 17:44:41 +0000 (19:44 +0200)

Trivial merge