From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 14 Jan 2020 13:01:21 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/linkexplode
X-Git-Tag: xonotic-v0.8.5~1105^2~15^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a9017e6791a5dd7de4ba669c3b1ff08d4347a5b;p=xonotic%2Fxonotic-data.pk3dir.git

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

3a9017e6791a5dd7de4ba669c3b1ff08d4347a5b