From: terencehill Date: Sun, 5 Apr 2015 22:54:48 +0000 (+0200) Subject: Merge branch 'master' into terencehill/unlimited_ammo_fixes X-Git-Tag: xonotic-v0.8.1~79^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=57f83651d7e6d030987f2108aad5c1340bd3e607;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/unlimited_ammo_fixes --- 57f83651d7e6d030987f2108aad5c1340bd3e607