Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 15 Oct 2015 16:55:38 +0000 (18:55 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 15 Oct 2015 16:55:38 +0000 (18:55 +0200)

Trivial merge