From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 9 Sep 2017 19:24:15 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/okc2
X-Git-Tag: xonotic-v0.8.5~2430^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ef456a7e36afd5c8279bb91a7d295b9b3fcd94c7;p=xonotic%2Fxonotic-data.pk3dir.git

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

ef456a7e36afd5c8279bb91a7d295b9b3fcd94c7