From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 12 Sep 2019 19:21:25 +0000 (+0200)
Subject: Merge branch 'master' into cloudwalk9/mgburstfix
X-Git-Tag: xonotic-v0.8.5~1287^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=139a594d29f65508e5d6001e90d4ee4fad82ca66;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into cloudwalk9/mgburstfix
---

139a594d29f65508e5d6001e90d4ee4fad82ca66