From: Samual Lenks <samual@xonotic.org>
Date: Sat, 14 Sep 2013 04:03:40 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/team_macros'
X-Git-Tag: xonotic-v0.8.0~334
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=06ee57203283ee16b27a716619866d0a524b6505

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

* origin/samual/team_macros:
  Make some nice macros for team comparisons
---

06ee57203283ee16b27a716619866d0a524b6505