From: Lyberta <lyberta@lyberta.net>
Date: Sat, 26 Aug 2017 18:24:14 +0000 (+0300)
Subject: Merged master into Lyberta/GivePlayerAmmo.
X-Git-Tag: xonotic-v0.8.5~2499^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dbe33129e12ed79bcd09e4063157d5abfe1d9ea5;p=xonotic%2Fxonotic-data.pk3dir.git

Merged master into Lyberta/GivePlayerAmmo.
---

dbe33129e12ed79bcd09e4063157d5abfe1d9ea5