From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 13:06:45 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/balance'
X-Git-Tag: xonotic-v0.5.0~330^2~14^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=30016be3301606bd261f442ebf74dc796567ffa1;p=xonotic%2Fxonotic-data.pk3dir.git

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

30016be3301606bd261f442ebf74dc796567ffa1