Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 8 Oct 2015 14:06:04 +0000 (16:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 8 Oct 2015 14:06:04 +0000 (16:06 +0200)

Trivial merge