From: samual <samual@samual-desktop.(none)>
Date: Thu, 20 May 2010 07:58:12 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balanceSamual
X-Git-Tag: xonotic-v0.1.0preview~593
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=59a4466589091544296dae7df539c76ca57bce06;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/balanceSamual

Conflicts:
	balanceSamual.cfg
---

59a4466589091544296dae7df539c76ca57bce06