Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 11 Nov 2011 15:19:56 +0000 (16:19 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 11 Nov 2011 15:19:56 +0000 (16:19 +0100)

Trivial merge