From: Mario <zacjardine@y7mail.com>
Date: Sat, 26 Aug 2017 16:04:07 +0000 (+0000)
Subject: Merge branch 'Mario/invasion_types' into 'master'
X-Git-Tag: xonotic-v0.8.5~2506
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e65a02df4c9af95d3950d82c390bc3fe979ebcf8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/invasion_types' into 'master'

Merge branch Mario/invasion_types (M merge request)

See merge request !471
---

e65a02df4c9af95d3950d82c390bc3fe979ebcf8