From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 20:42:10 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/crbalance'
X-Git-Tag: xonotic-v0.5.0~330^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=477edde098979fa53cd3304d26dfec00e41003b5;p=xonotic%2Fxonotic-data.pk3dir.git

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

477edde098979fa53cd3304d26dfec00e41003b5