From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 15 Aug 2010 12:35:08 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/fruitbalance'
X-Git-Tag: xonotic-v0.1.0preview~352
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=828bd15b179b231a7d6b8a4401cd2a302d7e6189

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

828bd15b179b231a7d6b8a4401cd2a302d7e6189