From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Nov 2013 18:59:47 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/arena_nuke'
X-Git-Tag: xonotic-v0.8.0~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2a2f3b8dcbd43bc0c127f25daccc81ea899756d0;p=xonotic%2Fxonotic-maps.pk3dir.git

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
---

2a2f3b8dcbd43bc0c127f25daccc81ea899756d0