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

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

387c8741f204da7abe419adbdbccccaa8110d20d