From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 10 May 2010 06:46:02 +0000 (+0200)
Subject: Merge remote branch 'origin/mirceakitsune/per_character_sounds'
X-Git-Tag: xonotic-v0.1.0preview~637^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=536ec6a3d46e301e787277369bb78eebc986640c;p=xonotic%2Fxonotic-data.pk3dir.git

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

536ec6a3d46e301e787277369bb78eebc986640c