Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 16 Jul 2015 10:09:29 +0000 (12:09 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 16 Jul 2015 10:09:29 +0000 (12:09 +0200)

Trivial merge