From: Mario <zacjardine@y7mail.com>
Date: Fri, 17 Mar 2017 13:19:51 +0000 (+0000)
Subject: Merge branch 'Mario/entcs_registry' into 'master'
X-Git-Tag: xonotic-v0.8.2~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d90297fe2e485703b2d5ed64540727fd52ea1b4e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/entcs_registry' into 'master'

Merge branch Mario/entcs_registry (S merge request)

See merge request !425
---

d90297fe2e485703b2d5ed64540727fd52ea1b4e