From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 28 Aug 2019 16:18:50 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/available
X-Git-Tag: xonotic-v0.8.5~1360^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F699%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/available
---

815bcc74c7f64dcb4a3ad63f40a844706743f682