Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 27 Jul 2011 14:17:39 +0000 (16:17 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 27 Jul 2011 14:17:39 +0000 (16:17 +0200)

Trivial merge