From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 12 Jan 2011 19:49:39 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/balance'
X-Git-Tag: xonotic-v0.5.0~318^2~133
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fc9b0d9f7b3baded6a49630983428ab489b5d7f3;p=xonotic%2Fxonotic-data.pk3dir.git

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

fc9b0d9f7b3baded6a49630983428ab489b5d7f3