Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 27 Aug 2015 22:15:50 +0000 (00:15 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 27 Aug 2015 22:15:50 +0000 (00:15 +0200)

Trivial merge