From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 25 Jul 2017 23:49:38 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/defaults
X-Git-Tag: xonotic-v0.8.5~2509^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90da6817bc443ee9402472527e746af2c254926e;p=xonotic%2Fxonotic-data.pk3dir.git

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

90da6817bc443ee9402472527e746af2c254926e