From: Mario <zacjardine@y7mail.com>
Date: Sun, 27 Aug 2017 19:20:22 +0000 (+0000)
Subject: Merge branch 'martin-t/okc' into 'master'
X-Git-Tag: xonotic-v0.8.5~2497
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d57bab388e5510670ec30721a10b0b14ff0519ca;p=xonotic%2Fxonotic-data.pk3dir.git

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

Overkill casual step 1

See merge request !464
---

d57bab388e5510670ec30721a10b0b14ff0519ca