From: Lyberta <lyberta@lyberta.net>
Date: Wed, 16 Aug 2017 00:16:25 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GivePlayerAmmo
X-Git-Tag: xonotic-v0.8.5~2459^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2183056a5b6e75d2e025aa6c718eeb6f87de31b6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/GivePlayerAmmo
---

2183056a5b6e75d2e025aa6c718eeb6f87de31b6