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

Trivial merge