From: terencehill <piuntn@gmail.com>
Date: Fri, 5 Apr 2019 17:18:20 +0000 (+0200)
Subject: Merge branch 'terencehill/name_tag_fix'
X-Git-Tag: xonotic-v0.8.5~1564
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9b8afb58ae6480bf57d06b11ccec094e0a5a61d2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/name_tag_fix'

Fix #2195: "Clan Arena: own name tag displayed over teammate's head when a round ends"

See merge request !629
---

9b8afb58ae6480bf57d06b11ccec094e0a5a61d2