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

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

c21b45f4213817b09099f99cc70e4f8d87f1713c