From: Mario <zacjardine@y7mail.com>
Date: Sat, 15 Jul 2017 01:00:57 +0000 (+0000)
Subject: Merge branch 'martint-t/weap-order' into 'master'
X-Git-Tag: xonotic-v0.8.5~2641
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b14c4594291cb19b39863bf1d6876bd4304ec90d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martint-t/weap-order' into 'master'

Fix weapon order

See merge request !454
---

b14c4594291cb19b39863bf1d6876bd4304ec90d