From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 24 Jul 2010 17:26:32 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/fruitbalance'
X-Git-Tag: xonotic-v0.1.0preview~414^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f60724df0f2a635ef1eeb4b8522059feed5e0236;p=xonotic%2Fxonotic-data.pk3dir.git

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

f60724df0f2a635ef1eeb4b8522059feed5e0236