From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 13 May 2011 20:11:55 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~103
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c9278887b506ba1f4135a7ce2451706293938b3;p=xonotic%2Fxonotic-data.pk3dir.git

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

6c9278887b506ba1f4135a7ce2451706293938b3