From: Mario <zacjardine@y7mail.com>
Date: Wed, 25 Apr 2018 12:53:22 +0000 (+0000)
Subject: Merge branch 'DefaultUser/trigger_cleanup' into 'master'
X-Git-Tag: xonotic-v0.8.5~2176
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8d8ce5d5b2504f7be1a5e0fd9d7219f401b0672;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'DefaultUser/trigger_cleanup' into 'master'

map entity cleanup

See merge request xonotic/xonotic-data.pk3dir!542
---

d8d8ce5d5b2504f7be1a5e0fd9d7219f401b0672