Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 12 Nov 2012 02:35:08 +0000 (03:35 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 12 Nov 2012 02:35:08 +0000 (03:35 +0100)

Trivial merge