Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 2 Aug 2011 17:53:05 +0000 (19:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 2 Aug 2011 17:53:05 +0000 (19:53 +0200)

Trivial merge