From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Nov 2017 01:19:47 +0000 (+0000)
Subject: Merge branch 'martin-t/okc2' into 'master'
X-Git-Tag: xonotic-v0.8.5~2430
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ac7aeb0215b2f4efd7564de1ff9298dd2cf02125;p=xonotic%2Fxonotic-data.pk3dir.git

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

Overkill Casual - step 2 - dodging

See merge request xonotic/xonotic-data.pk3dir!469
---

ac7aeb0215b2f4efd7564de1ff9298dd2cf02125