Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 2 Jan 2014 11:33:43 +0000 (12:33 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 2 Jan 2014 11:33:43 +0000 (12:33 +0100)

Trivial merge