Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 9 Aug 2011 19:03:44 +0000 (21:03 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 9 Aug 2011 19:03:44 +0000 (21:03 +0200)

Trivial merge