From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 13 Aug 2019 19:30:39 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/ok-config
X-Git-Tag: xonotic-v0.8.5~1385^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=844e98d0ff1f0e004e89e9162e951a50cd7978d7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/ok-config
---

844e98d0ff1f0e004e89e9162e951a50cd7978d7