From: Samual Lenks <samual@xonotic.org>
Date: Wed, 26 Feb 2014 20:38:55 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/teams_override'
X-Git-Tag: xonotic-v0.8.0~226^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=daaa53f974bdb4cdf8ec00714eae77d2bdd5e128;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/teams_override'

# By Mario
# Via Mario
* origin/Mario/teams_override:
  Remove keepaway team cvars from config
---

daaa53f974bdb4cdf8ec00714eae77d2bdd5e128