From: Mario <mario@smbclan.net>
Date: Sun, 27 Aug 2017 12:41:08 +0000 (+1000)
Subject: Merge branch 'master' into Lyberta/GivePlayerAmmo
X-Git-Tag: xonotic-v0.8.5~2499^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81062a39c99785039ceee2dcd187fed9352a08c5;p=xonotic%2Fxonotic-data.pk3dir.git

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

81062a39c99785039ceee2dcd187fed9352a08c5