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

Merge remote branch 'origin/mirceakitsune/damage_effects'
---

3e3baa2f19b654ab2982198e00ea8b09f885c66d