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

Trivial merge