Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 25 Jul 2011 15:36:54 +0000 (17:36 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 25 Jul 2011 15:36:54 +0000 (17:36 +0200)

Trivial merge