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

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

8aa33216649215618dd1de7be0f48ca77449bb0c