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

Trivial merge