From: Mario <zacjardine@y7mail.com>
Date: Sat, 11 Jul 2015 13:23:01 +0000 (+1000)
Subject: Merge branch 'Mario/map_nukes'
X-Git-Tag: xonotic-v0.8.1~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94a66c4f37e7ef534e6d9d1b3bcf5dbcf5fe468c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mario/map_nukes'
---

94a66c4f37e7ef534e6d9d1b3bcf5dbcf5fe468c