From: Lyberta <lyberta@lyberta.net>
Date: Fri, 28 Apr 2017 21:32:13 +0000 (+0300)
Subject: Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99c05ba4f11e42c84b90d9013d67b79dcb45dc4c;p=xonotic%2Fxonotic-data.pk3dir.git

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

99c05ba4f11e42c84b90d9013d67b79dcb45dc4c