From: Samual <samual@xonotic.org>
Date: Wed, 5 Oct 2011 04:32:32 +0000 (-0400)
Subject: Merge remote branch 'origin/samual/balance'
X-Git-Tag: xonotic-v0.6.0~40^2~92^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4dd3145f26ea8732c361a6fefbd00f6e82d8b8f6;p=xonotic%2Fxonotic-data.pk3dir.git

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

4dd3145f26ea8732c361a6fefbd00f6e82d8b8f6