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

Trivial merge