From: Samual <samual@xonotic.org>
Date: Fri, 4 Nov 2011 19:06:05 +0000 (-0400)
Subject: Merge remote branch 'origin/samual/balance'
X-Git-Tag: xonotic-v0.6.0~35^2~66^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f63c5df9954468200864882d1331b9f4acaed9d;p=xonotic%2Fxonotic-data.pk3dir.git

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

8f63c5df9954468200864882d1331b9f4acaed9d