Merge remote-tracking branch 'origin/samual/team_macros'
authorSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:03:40 +0000 (00:03 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 14 Sep 2013 04:03:40 +0000 (00:03 -0400)
* origin/samual/team_macros:
  Make some nice macros for team comparisons


Trivial merge