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

Trivial merge