Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 4 Nov 2011 14:34:40 +0000 (15:34 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 4 Nov 2011 14:34:40 +0000 (15:34 +0100)

Trivial merge