From: Samual Date: Fri, 20 Jan 2012 01:16:35 +0000 (-0500) Subject: Merge remote branch 'origin/master' into mirceakitsune/damage_effects X-Git-Tag: xonotic-v0.6.0~110^2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa0c6afce104a7e0afa9a40c5dc4b7b66d76fa22;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into mirceakitsune/damage_effects --- fa0c6afce104a7e0afa9a40c5dc4b7b66d76fa22