From: Mario <mario@smbclan.net>
Date: Mon, 11 Jun 2018 07:37:18 +0000 (+1000)
Subject: Merge branch 'master' into Mario/bullet_trails
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Fbullet_trails;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/bullet_trails
---

76868f18ff209042dd93e55d57e7ad9c76d70910