From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 1 Dec 2010 20:13:31 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/balance'
X-Git-Tag: xonotic-v0.1.0preview~82
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3977ea84ad5aec855e191af400ec8a31f6f4933a;p=xonotic%2Fxonotic-data.pk3dir.git

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

3977ea84ad5aec855e191af400ec8a31f6f4933a