From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 3 Oct 2010 10:18:10 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/fruitbalance'
X-Git-Tag: xonotic-v0.1.0preview~282^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2aaf35ba7cfc2267e90a7b272818a95f2c8a653;p=xonotic%2Fxonotic-data.pk3dir.git

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

c2aaf35ba7cfc2267e90a7b272818a95f2c8a653