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

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

63841ddfb9349787f6380b9e9e2606e6d7ed9eb6