From: terencehill Date: Wed, 15 Apr 2015 22:47:56 +0000 (+0200) Subject: Merge branch 'master' into terencehill/unlimited_ammo_fixes X-Git-Tag: xonotic-v0.8.1~79^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=861f9af7d409dd3b018456e403cee29c26419f11;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/unlimited_ammo_fixes --- 861f9af7d409dd3b018456e403cee29c26419f11