Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 15 Nov 2011 16:29:06 +0000 (17:29 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 15 Nov 2011 16:29:06 +0000 (17:29 +0100)

Trivial merge