Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/ca_arena_mutators

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/mutators/mutators.qh
Simple merge

diff --cc qcsrc/server/progs.src
index 7c3f23e3e7688efa2129a0bb31501aa1905ac722,340487ae5dde450cc902f644d0a0310722f08136..654b77f2936faf1dc61c0a6673a28dfd4909b07c
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -29,9 -29,8 +29,10 @@@ defs.qh              // Should rename this, it has 
  
  mutators/base.qh
  mutators/mutators.qh
 +mutators/gamemode_arena.qh
 +mutators/gamemode_ca.qh
  mutators/gamemode_ctf.qh
+ mutators/gamemode_domination.qh
  mutators/gamemode_keyhunt.qh // TODO fix this
  mutators/gamemode_keepaway.qh
  mutators/gamemode_nexball.qh 
@@@ -212,9 -212,8 +213,10 @@@ round_handler.q
  ../common/explosion_equation.qc
  
  mutators/base.qc
 +mutators/gamemode_arena.qc
 +mutators/gamemode_ca.qc
  mutators/gamemode_ctf.qc
+ mutators/gamemode_domination.qc
  mutators/gamemode_freezetag.qc
  mutators/gamemode_keyhunt.qc
  mutators/gamemode_keepaway.qc

diff --cc qcsrc/server/teamplay.qc
Simple merge