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

Trivial merge