From: Samual Date: Mon, 17 Oct 2011 18:31:34 +0000 (-0400) Subject: Merge remote branch 'origin/master' into mirceakitsune/fix_chase_damageblur X-Git-Tag: xonotic-v0.6.0~40^2~30^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7b7780a48b5ed5d6bd62099b4d43296c285dacb;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into mirceakitsune/fix_chase_damageblur --- c7b7780a48b5ed5d6bd62099b4d43296c285dacb