From: Samual Date: Wed, 17 Aug 2011 01:34:22 +0000 (-0400) Subject: Merge remote branch 'origin/master' into terencehill/infinite_ammo X-Git-Tag: xonotic-v0.5.0~95^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3e13a6eac82464c004af16230f1da2b92776636;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into terencehill/infinite_ammo --- e3e13a6eac82464c004af16230f1da2b92776636