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

Trivial merge