From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 19 Oct 2011 20:20:15 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/damage_effects
X-Git-Tag: xonotic-v0.6.0~110^2^2~88
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a8f44b0e98aedacaae872b937ee023e24fc30878

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

a8f44b0e98aedacaae872b937ee023e24fc30878