From: Samual <samual@xonotic.org>
Date: Wed, 21 Sep 2011 14:56:56 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3eeee80c45475969066bc9625eeb87773b22bbe2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/balance

Conflicts:
	balanceXonotic.cfg
---

3eeee80c45475969066bc9625eeb87773b22bbe2