From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Sep 2018 01:26:44 +0000 (+0000)
Subject: Merge branch 'terencehill/ft_bugfix' into 'master'
X-Git-Tag: xonotic-v0.8.5~1827
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1ff1288152dd20786853bed28c9d9aad1f21c8a5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/ft_bugfix' into 'master'

FT bugfixes

Closes #2098 and #2079

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

1ff1288152dd20786853bed28c9d9aad1f21c8a5