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

Trivial merge