From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 19 Jul 2017 13:55:20 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/defaults
X-Git-Tag: xonotic-v0.8.5~2430^2~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91be51af76146036564f55499150039f62f772c5;p=xonotic%2Fxonotic-data.pk3dir.git

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

91be51af76146036564f55499150039f62f772c5