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

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

1deb523af5f2edddb70ed34cbb0d4463f21d6cad