Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 5 Aug 2011 17:56:55 +0000 (19:56 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 5 Aug 2011 17:56:55 +0000 (19:56 +0200)

Trivial merge