From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 6 Aug 2017 00:57:23 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/defaults
X-Git-Tag: xonotic-v0.8.5~2535^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae277921268b84c7b7ee5ab901ce7f0088c07605;p=xonotic%2Fxonotic-data.pk3dir.git

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

ae277921268b84c7b7ee5ab901ce7f0088c07605