Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 13 Sep 2011 14:44:24 +0000 (16:44 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 13 Sep 2011 14:44:24 +0000 (16:44 +0200)

Trivial merge