Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 5 Apr 2012 16:01:22 +0000 (18:01 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 5 Apr 2012 16:01:22 +0000 (18:01 +0200)

Trivial merge