Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 11 Oct 2011 17:59:57 +0000 (19:59 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 11 Oct 2011 17:59:57 +0000 (19:59 +0200)

Trivial merge