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

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

3dc27fffa54e5179cd9e0cd82e0d33dea916ed5c