Merge remote-tracking branch 'origin/Mario/arena_nuke'
authorSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 18:59:47 +0000 (13:59 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 24 Nov 2013 18:59:47 +0000 (13:59 -0500)
commit2a2f3b8dcbd43bc0c127f25daccc81ea899756d0
tree8198efe21e5ad756e1119abf9c473dd8403df44f
parent9dbd16ca8688fbd7803cd9ec5a4d2c0ddae419e4
parent515bb9530fbf9c27a8837d4a3e44526a2ad2b885
Merge remote-tracking branch 'origin/Mario/arena_nuke'

# By Mario
# Via Mario
* origin/Mario/arena_nuke:
  Remove arena from a few missed mapinfos
  Remove arena from mapinfos