From: terencehill <piuntn@gmail.com>
Date: Thu, 1 Nov 2018 14:25:19 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/dmgtext
X-Git-Tag: xonotic-v0.8.5~1729^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=62d736d8c3a51baf5fa3a4265e39a2b773704a91;p=xonotic%2Fxonotic-data.pk3dir.git

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

62d736d8c3a51baf5fa3a4265e39a2b773704a91