Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 22 Sep 2011 19:35:02 +0000 (21:35 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 22 Sep 2011 19:35:02 +0000 (21:35 +0200)

Trivial merge