Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 10 Aug 2011 12:16:04 +0000 (14:16 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 10 Aug 2011 12:16:04 +0000 (14:16 +0200)

Trivial merge