From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 7 Aug 2017 18:37:04 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/okc
X-Git-Tag: xonotic-v0.8.5~2430^2~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2dfdf060fe0af57cd8b0026b5e7e235742e5ace6;p=xonotic%2Fxonotic-data.pk3dir.git

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

2dfdf060fe0af57cd8b0026b5e7e235742e5ace6