Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 19 Dec 2011 16:16:23 +0000 (17:16 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 19 Dec 2011 16:16:23 +0000 (17:16 +0100)

Trivial merge