Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 15 Nov 2011 16:34:50 +0000 (17:34 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 15 Nov 2011 16:34:50 +0000 (17:34 +0100)

Trivial merge