Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 26 Jul 2011 18:27:16 +0000 (20:27 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 26 Jul 2011 18:27:16 +0000 (20:27 +0200)

Trivial merge