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

Trivial merge