Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 19 Oct 2011 14:23:54 +0000 (16:23 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 19 Oct 2011 14:23:54 +0000 (16:23 +0200)

Trivial merge