Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 13 Feb 2012 11:18:25 +0000 (12:18 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 13 Feb 2012 11:18:25 +0000 (12:18 +0100)

Trivial merge