Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 13 Sep 2011 19:27:08 +0000 (21:27 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 13 Sep 2011 19:27:08 +0000 (21:27 +0200)

Trivial merge