Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 20 Oct 2011 13:20:36 +0000 (15:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 20 Oct 2011 13:20:36 +0000 (15:20 +0200)

Trivial merge