From: Mario <zacjardine@y7mail.com>
Date: Tue, 16 May 2017 22:15:33 +0000 (+0000)
Subject: Merge branch 'Mario/cts_respawn_clear' into 'master'
X-Git-Tag: xonotic-v0.8.5~2782
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63ab06764e6e0a20481ab406863eb7bca32cb669;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/cts_respawn_clear' into 'master'

Merge branch Mario/cts_respawn_clear (S merge request)

See merge request !432
---

63ab06764e6e0a20481ab406863eb7bca32cb669