From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Sep 2018 12:30:31 +0000 (+0000)
Subject: Merge branch 'Mario/duel' into 'master'
X-Git-Tag: xonotic-v0.8.5~1809
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6106500d9562e3964f10a534b2721b35d764c995;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/duel' into 'master'

Merge branch Mario/duel (S merge request)

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

6106500d9562e3964f10a534b2721b35d764c995