From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 16 Nov 2018 10:00:17 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/globals
X-Git-Tag: xonotic-v0.8.5~1258^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d6f21900d200a9f7941803cb308f483e818dda4;p=xonotic%2Fxonotic-data.pk3dir.git

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

8d6f21900d200a9f7941803cb308f483e818dda4