From: Mario <mario.mario@y7mail.com>
Date: Thu, 26 Sep 2019 11:24:45 +0000 (+0000)
Subject: Merge branch 'morosophos/defrag-haste2' into 'master'
X-Git-Tag: xonotic-v0.8.5~1271
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=87390523a589c3bb63ee6826efe4a261544d7241;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'morosophos/defrag-haste2' into 'master'

Rebase q3 haste changes on top of Mario's buff timers work

Closes #2228

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

87390523a589c3bb63ee6826efe4a261544d7241