From: Mario <zacjardine@y7mail.com>
Date: Fri, 6 Apr 2018 17:43:10 +0000 (+0000)
Subject: Merge branch 'Mario/crouch' into 'master'
X-Git-Tag: xonotic-v0.8.5~2199
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1852dd0b6c285f4c8d44e08efb6c9ea0709658eb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/crouch' into 'master'

Merge branch Mario/crouch (XS merge request)

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

1852dd0b6c285f4c8d44e08efb6c9ea0709658eb