From: Mario <zacjardine@y7mail.com>
Date: Sat, 20 May 2017 09:29:47 +0000 (+0000)
Subject: Merge branch 'Mario/intrusive' into 'master'
X-Git-Tag: xonotic-v0.8.5~2768
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b300d8633ba07aa6d162a766e0d1d61a391e2bb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/intrusive' into 'master'

Merge branch Mario/intrusive (S merge request)

See merge request !441
---

2b300d8633ba07aa6d162a766e0d1d61a391e2bb