From: Mario <zacjardine@y7mail.com>
Date: Fri, 7 Sep 2018 22:48:19 +0000 (+0000)
Subject: Merge branch 'Mario/item_wepammo_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~1897
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=958d2ae389ca20ed9ff65ff4f8253f4388edc3fc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/item_wepammo_fix' into 'master'

Merge branch Mario/item_wepammo_fix (S merge request)

Closes #1920

See merge request xonotic/xonotic-data.pk3dir!587
---

958d2ae389ca20ed9ff65ff4f8253f4388edc3fc