From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 28 Jul 2010 20:01:04 +0000 (+0300)
Subject: Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~397
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbf4bf11285d7ccb0335f451e062fa36b5e5e978;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance
---

fbf4bf11285d7ccb0335f451e062fa36b5e5e978