Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 3 Dec 2012 17:35:27 +0000 (18:35 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 3 Dec 2012 17:35:27 +0000 (18:35 +0100)

Trivial merge