From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 22 Apr 2011 15:38:58 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~105
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c4cb3b3af3770d7629b3cef9332e06129294bb3a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/damage_effects
---

c4cb3b3af3770d7629b3cef9332e06129294bb3a