Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 21 Jul 2011 18:53:20 +0000 (20:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 21 Jul 2011 18:53:20 +0000 (20:53 +0200)

Trivial merge