From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 12 Apr 2011 17:14:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/samual/balance'
X-Git-Tag: xonotic-v0.5.0~297^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f7f36e7cb72f1c9709219b1fdc52e3f5dc3748d3;p=xonotic%2Fxonotic-data.pk3dir.git

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

f7f36e7cb72f1c9709219b1fdc52e3f5dc3748d3