From: Mario <mario@smbclan.net>
Date: Sun, 27 May 2018 03:35:54 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weapons_fpsfix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ffa308cebc3660cfa790a3dc5c07dc722c67ebbb;p=xonotic%2Fxonotic-data.pk3dir.git

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

ffa308cebc3660cfa790a3dc5c07dc722c67ebbb