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

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

57574d20e9aa4cf305e28e2cd4b7749dabe4f8ea