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

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

db4495bd15e5b580fd2db04b293152e4dce75a49