Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 1 Sep 2012 15:36:52 +0000 (17:36 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 1 Sep 2012 15:36:52 +0000 (17:36 +0200)

Trivial merge