From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 26 Nov 2010 08:56:31 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/add_soundchan'
X-Git-Tag: xonotic-v0.1.0preview~101^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a8b77d9bb65c2f94eb9bb3395866a47226449c08;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/add_soundchan'
---

a8b77d9bb65c2f94eb9bb3395866a47226449c08