Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 8 Nov 2011 18:18:59 +0000 (19:18 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 8 Nov 2011 18:18:59 +0000 (19:18 +0100)

Trivial merge