Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 10 Nov 2011 21:10:06 +0000 (22:10 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 10 Nov 2011 21:10:06 +0000 (22:10 +0100)

Trivial merge