From: Mario <zacjardine@y7mail.com>
Date: Sat, 17 Aug 2019 14:49:54 +0000 (+0000)
Subject: Merge branch 'Mario/buff_timer' into 'master'
X-Git-Tag: xonotic-v0.8.5~1389
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ce491d5d46adc539776d175c258e8e89405689c8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/buff_timer' into 'master'

Merge branch Mario/buff_timer (M merge request)

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

ce491d5d46adc539776d175c258e8e89405689c8