From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 18 Sep 2019 03:14:23 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/vbots
X-Git-Tag: xonotic-v0.8.5~1275^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=014563bb18d2fca287bd53fbde65b057e4ec6eef;p=xonotic%2Fxonotic-data.pk3dir.git

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

014563bb18d2fca287bd53fbde65b057e4ec6eef