From: Mirio <opivy@hotmail.de>
Date: Sat, 5 Aug 2017 16:02:40 +0000 (+0000)
Subject: Merge branch 'terencehill/boil_trigger_hurt' into 'master'
X-Git-Tag: xonotic-v0.8.5~151
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80aef22bc82e5bb0a145e1a16c788a742bf2a6c7;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'terencehill/boil_trigger_hurt' into 'master'

Boil: move trigger_hurt down

See merge request !103
---

80aef22bc82e5bb0a145e1a16c788a742bf2a6c7