From: Mario <mario@smbclan.net>
Date: Tue, 5 Jun 2018 07:26:08 +0000 (+1000)
Subject: Merge branch 'Mario/weapons_stat'
X-Git-Tag: xonotic-v0.8.5~2109
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc78077027a449f7440197953c3b21d6dc944565;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/weapons_stat'
---

cc78077027a449f7440197953c3b21d6dc944565