Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 13 Feb 2012 14:00:05 +0000 (15:00 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 13 Feb 2012 14:00:05 +0000 (15:00 +0100)

Trivial merge