Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 30 Sep 2011 19:39:53 +0000 (21:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 30 Sep 2011 19:39:53 +0000 (21:39 +0200)

Trivial merge