From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 28 Nov 2018 14:02:09 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/globals
X-Git-Tag: xonotic-v0.8.5~1258^2~9
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=95cf7d7374c5544e7d172e51e08fc3e97be0444a;hp=-c

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

95cf7d7374c5544e7d172e51e08fc3e97be0444a