From: Rudolf Polzer <divverent@gmail.com>
Date: Sun, 11 Jan 2015 16:10:26 +0000 (+0000)
Subject: Merge branch 'terencehill/eliminatedplayer_fix' into 'master'
X-Git-Tag: xonotic-v0.8.0~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc766534b2ee0db5cae9bea0448ae836c877ed19;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/eliminatedplayer_fix' into 'master'

Terencehill/eliminatedplayer fix

Fix #1455 "Spectating frozen players blanks out spectator name"

See merge request !81
---

bc766534b2ee0db5cae9bea0448ae836c877ed19