From: terencehill <piuntn@gmail.com>
Date: Sat, 16 Feb 2019 23:08:47 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: xonotic-v0.8.5~1600
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=797bf448a96c0c13d783c7c919bb2caf6fa16707;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into 'master'

Fix crash when g_maxplayers smaller than current amount of active players

See merge request xonotic/xonotic-data.pk3dir!637
---

797bf448a96c0c13d783c7c919bb2caf6fa16707