Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'
authorSamual Lenks <samual@xonotic.org>
Thu, 17 Oct 2013 20:31:49 +0000 (16:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 17 Oct 2013 20:31:49 +0000 (16:31 -0400)
* origin/samual/warmup_onlyonmap:
  Add feature to warmup_allguns which only provides weapons in the map


Trivial merge