Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 19 Aug 2011 14:41:55 +0000 (16:41 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 19 Aug 2011 14:41:55 +0000 (16:41 +0200)

Trivial merge