From: Mario <mario@smbclan.net>
Date: Sat, 20 May 2017 06:04:50 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weapons_fpsfix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9df080e5fab27db9c8b217f497a2c2a6a827f38d;p=xonotic%2Fxonotic-data.pk3dir.git

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

9df080e5fab27db9c8b217f497a2c2a6a827f38d