From: Morosophos <morosophos@teichisma.info>
Date: Mon, 12 Oct 2020 07:32:14 +0000 (+0300)
Subject: Merge upstream
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0acad706dc00e6dde1d21fde1bdc9a8c8f672f6d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge upstream
---

0acad706dc00e6dde1d21fde1bdc9a8c8f672f6d