Merge branch 'martin-t/seta' into martin-t/master2

diff --cc gamemodes-server.cfg
index 2a3bc32782209dcd5b980c400632599805bd5cf1,fc441af951e38d758cdad0b923a646f55aff44af..282ea40f6c45eb2574eb8377433e81164f805c3f
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -365,9 -365,9 +365,9 @@@ set g_freezetag_revive_clearspeed 1.6 "
  set g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
  set g_freezetag_revive_nade 1 "Enable reviving from own nade explosion"
  set g_freezetag_revive_nade_health 40 "Amount of health player has if they revived from their own nade explosion"
 -set g_freezetag_round_timelimit 180 "round time limit in seconds"
 +set g_freezetag_round_timelimit 360 "round time limit in seconds"
  set g_freezetag_frozen_maxtime 60 "frozen players will be automatically unfrozen after this time in seconds"
- seta g_freezetag_teams_override 0
+ set g_freezetag_teams_override 0
  set g_freezetag_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
  set g_freezetag_teams 0