From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 3 Dec 2010 07:30:32 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/balance'
X-Git-Tag: xonotic-v0.1.0preview~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b67c0e203ebcc0060ab7d7618565f3a3df75cdbc;p=xonotic%2Fxonotic-data.pk3dir.git

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

b67c0e203ebcc0060ab7d7618565f3a3df75cdbc