From: Mario <mario@smbclan.net>
Date: Mon, 3 Jul 2017 13:39:50 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weapons_fpsfix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dba139659d3065acc8993b8ce9bfab7c5307bea5;p=xonotic%2Fxonotic-data.pk3dir.git

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

dba139659d3065acc8993b8ce9bfab7c5307bea5