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

Trivial merge