From: Mario <mario@smbclan.net>
Date: Sun, 17 Jun 2018 08:04:51 +0000 (+1000)
Subject: Merge branch 'master' into Mario/event_heal
X-Git-Tag: xonotic-v0.8.5~2022^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa69b91af5a7b45229c6f9fbf18214b4b17c5a84;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/event_heal
---

aa69b91af5a7b45229c6f9fbf18214b4b17c5a84