From: Lyberta <lyberta@lyberta.net>
Date: Wed, 12 Apr 2017 05:36:04 +0000 (+0300)
Subject: Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1035395f4145aabeffe9677a6a6fccb0ccbf7204;p=xonotic%2Fxonotic-data.pk3dir.git

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

1035395f4145aabeffe9677a6a6fccb0ccbf7204