Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 5 Sep 2012 11:44:09 +0000 (13:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 5 Sep 2012 11:44:09 +0000 (13:44 +0200)

Trivial merge