Merge branch 'master' into terencehill/freezetag_updates

# Conflicts:
#	gamemodes-server.cfg

diff --cc gamemodes-server.cfg
index bb17922f82afbfac06d1f4c252d9ba8625f3e4c7,65fb610c84846a6f55ae99a94ccc34cdf12bd20f..77a6d735dc80c97fff785a4ffdbf9ecabc7d1fca
--- 1/gamemodes-server.cfg
--- 2/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@@ -363,7 -363,7 +363,7 @@@ set g_domination_warmup 5 "time player
  //  freezetag
  // ===========
  set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them"
- set g_freezetag_warmup 10 "Time players get to run around before the round starts"
 -set g_freezetag_warmup 5 "time players get to run around before the round starts"
++set g_freezetag_warmup 10 "time players get to run around before the round starts"
  set g_freezetag_point_limit -1        "Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_freezetag_point_leadlimit -1    "Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  set g_freezetag_revive_speed 0.4 "Speed for reviving a frozen teammate"