Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 22 Sep 2011 14:31:38 +0000 (16:31 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 22 Sep 2011 14:31:38 +0000 (16:31 +0200)

Trivial merge