From: Mario <mario@smbclan.net>
Date: Tue, 19 Jun 2018 01:34:10 +0000 (+1000)
Subject: Merge branch 'Mario/playerdemo_removal'
X-Git-Tag: xonotic-v0.8.5~2011
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=50d6cb6a02a959a7303b5b687631b664a807b26f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/playerdemo_removal'
---

50d6cb6a02a959a7303b5b687631b664a807b26f