Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 30 Sep 2011 16:55:54 +0000 (18:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 30 Sep 2011 16:55:54 +0000 (18:55 +0200)

Trivial merge