From: mand1nga <mand1nga@xonotic.org>
Date: Mon, 4 Apr 2011 00:38:36 +0000 (-0300)
Subject: Merge remote branch 'origin/samual/balance'
X-Git-Tag: xonotic-v0.5.0~307^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=074459aab85964e07860bfaeae24bcdcd1940f4b;p=xonotic%2Fxonotic-data.pk3dir.git

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

074459aab85964e07860bfaeae24bcdcd1940f4b