From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 4 May 2010 13:43:55 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/per_character_sounds
X-Git-Tag: xonotic-v0.1.0preview~637^2^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4bac00fdbd1726c76efffcada6253259762f83c6;p=xonotic%2Fxonotic-data.pk3dir.git

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

4bac00fdbd1726c76efffcada6253259762f83c6