From: Mario <zacjardine@y7mail.com>
Date: Tue, 29 Nov 2016 14:01:37 +0000 (+0000)
Subject: Merge branch 'martin-t/msnt' into 'master'
X-Git-Tag: xonotic-v0.8.2~405
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cee38d12f87ade4ea459f39829bc18bf1744414b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/msnt' into 'master'

Spawning near teammates: don't spawn on chatting players

See merge request !392
---

cee38d12f87ade4ea459f39829bc18bf1744414b