From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 22 Oct 2010 20:42:02 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
X-Git-Tag: xonotic-v0.1.0preview~257^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d8bfca85ca07554a1c7be5c508b822a1b4e90978;hp=f2e1181ca79b8415e15d91333db3f84655655600

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