From: Mario <zacjardine@y7mail.com>
Date: Mon, 18 Jun 2018 01:23:07 +0000 (+0000)
Subject: Merge branch 'Mario/event_heal' into 'master'
X-Git-Tag: xonotic-v0.8.5~2022
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68bea9632f5a193d608cf7aab9f6c38ae882ce0d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/event_heal' into 'master'

Merge branch Mario/event_heal (M merge request)

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

68bea9632f5a193d608cf7aab9f6c38ae882ce0d