From: Mario <mario@smbclan.net>
Date: Tue, 4 Apr 2017 21:22:54 +0000 (+1000)
Subject: Merge branch 'master' into Mario/cts_respawn_clear
X-Git-Tag: xonotic-v0.8.5~2782^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63de1215428d078d5fb2021c49edf59a7900cef9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/cts_respawn_clear
---

63de1215428d078d5fb2021c49edf59a7900cef9