From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 15 Feb 2018 10:20:56 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/dmgtext
X-Git-Tag: xonotic-v0.8.5~1729^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8c534ca0de1fcd2a3bab8c9092cc910942d2e63;p=xonotic%2Fxonotic-data.pk3dir.git

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

e8c534ca0de1fcd2a3bab8c9092cc910942d2e63