From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 17:24:21 +0000 (+1100)
Subject: Merge branch 'Mirio/map_updates'
X-Git-Tag: xonotic-v0.8.0~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=24b0616986e4485003936128293a4a3c2145ebe8;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/map_updates'
---

24b0616986e4485003936128293a4a3c2145ebe8