Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 7 Sep 2011 13:15:16 +0000 (15:15 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 7 Sep 2011 13:15:16 +0000 (15:15 +0200)

Trivial merge