Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 31 Dec 2012 02:19:52 +0000 (03:19 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 31 Dec 2012 02:19:52 +0000 (03:19 +0100)

Trivial merge