From: Mario <zacjardine@y7mail.com>
Date: Tue, 21 Feb 2017 10:21:35 +0000 (+0000)
Subject: Merge branch 'morphed/newrl' into 'master'
X-Git-Tag: xonotic-v0.8.2~188
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=627f552545e5fb21aca7d81d7630adde3c61ad94;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'morphed/newrl' into 'master'

Merge branch morphed/newrl (XS merge request)

See merge request !410
---

627f552545e5fb21aca7d81d7630adde3c61ad94