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

Trivial merge