From: Samual <samual@xonotic.org>
Date: Fri, 23 Sep 2011 05:58:01 +0000 (-0400)
Subject: Merge remote branch 'origin/samual/balance'
X-Git-Tag: xonotic-v0.6.0~40^2~118
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=51650d328de48c611eec30ebf60ad3b152a409c9;p=xonotic%2Fxonotic-data.pk3dir.git

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

51650d328de48c611eec30ebf60ad3b152a409c9