Merge branch 'master' into 'master'
authorterencehill <piuntn@gmail.com>
Sat, 16 Feb 2019 23:08:47 +0000 (23:08 +0000)
committerterencehill <piuntn@gmail.com>
Sat, 16 Feb 2019 23:08:47 +0000 (23:08 +0000)
Fix crash when g_maxplayers smaller than current amount of active players

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

1  2 
qcsrc/server/bot/default/bot.qc

Simple merge