Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 8 Sep 2012 16:04:04 +0000 (18:04 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 8 Sep 2012 16:04:04 +0000 (18:04 +0200)

Trivial merge