From: Mario <zacjardine@y7mail.com>
Date: Mon, 18 Sep 2017 15:49:20 +0000 (+0000)
Subject: Merge branch 'martin-t/has_origin' into 'master'
X-Git-Tag: xonotic-v0.8.5~2467
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=235e1cf920d59aca16a705699c45e6d83818d5cd;p=xonotic%2Fxonotic-data.pk3dir.git

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

Document potential bug in entcs

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

235e1cf920d59aca16a705699c45e6d83818d5cd