From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 11 May 2017 18:30:11 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/dmgtext2
X-Git-Tag: xonotic-v0.8.5~2656^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3b3e56d6c0e203d312fd5ee5ec680404c4e9dc2d;p=xonotic%2Fxonotic-data.pk3dir.git

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

3b3e56d6c0e203d312fd5ee5ec680404c4e9dc2d