From: terencehill <piuntn@gmail.com>
Date: Fri, 16 Jun 2017 21:22:31 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/dmgtext2
X-Git-Tag: xonotic-v0.8.5~2656^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e429efe7622f7ea5c504f2dd5e9e2cd0f91c8cc;p=xonotic%2Fxonotic-data.pk3dir.git

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

3e429efe7622f7ea5c504f2dd5e9e2cd0f91c8cc