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

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

d3bd5ddddada8dda32a45b8d4cabcfacc9fd685f