Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 7 Jun 2012 21:14:41 +0000 (23:14 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 7 Jun 2012 21:14:41 +0000 (23:14 +0200)

Trivial merge