Merge branch 'master' into mario/domination_mutator

diff --combined qcsrc/server/mutators/mutators.qh
index f6327a16385984a2715c6c183a1485f6e8ffe63c,7fcfd9883bb9195f24b7f513ffc1e8189d03c014..4bdcbb28234834629ecc13f8f52767fcd1e4ce90
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -4,7 -4,6 +4,7 @@@ MUTATOR_DECLARATION(gamemode_keepaway)
  MUTATOR_DECLARATION(gamemode_ctf);
  MUTATOR_DECLARATION(gamemode_nexball);
  MUTATOR_DECLARATION(gamemode_onslaught);
 +MUTATOR_DECLARATION(gamemode_domination);
  
  MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_invincibleprojectiles);
@@@ -12,6 -11,7 +12,7 @@@ MUTATOR_DECLARATION(mutator_new_toys)
  MUTATOR_DECLARATION(mutator_nix);
  MUTATOR_DECLARATION(mutator_rocketflying);
  MUTATOR_DECLARATION(mutator_spawn_near_teammate);
+ MUTATOR_DECLARATION(mutator_physical_items);
  MUTATOR_DECLARATION(mutator_vampire);
  MUTATOR_DECLARATION(mutator_superspec);
  

diff --combined qcsrc/server/progs.src
index d04d5ac70a1e34bbd9e0ae7749e793be4fdbc22e,36936e38642e597bad39ca5b3d56621450a9dbe1..f1bdb24439ee84eab4c5aef4a59597c79a720b0a
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -30,7 -30,6 +30,7 @@@ defs.qh               // Should rename this, it has 
  mutators/base.qh
  mutators/mutators.qh
  mutators/gamemode_ctf.qh
 +mutators/gamemode_domination.qh
  mutators/gamemode_keyhunt.qh // TODO fix this
  mutators/gamemode_keepaway.qh
  mutators/gamemode_nexball.qh 
@@@ -142,7 -141,7 +142,7 @@@ t_plats.q
  antilag.qc
  
  //ctf.qc
 -domination.qc
 +//domination.qc
  //mode_onslaught.qc
  //nexball.qc
  g_hook.qc
@@@ -209,7 -208,6 +209,7 @@@ playerstats.q
  
  mutators/base.qc
  mutators/gamemode_ctf.qc
 +mutators/gamemode_domination.qc
  mutators/gamemode_freezetag.qc
  mutators/gamemode_keyhunt.qc
  mutators/gamemode_keepaway.qc
@@@ -222,6 -220,7 +222,7 @@@ mutators/mutator_dodging.q
  mutators/mutator_rocketflying.qc
  mutators/mutator_vampire.qc
  mutators/mutator_spawn_near_teammate.qc
+ mutators/mutator_physical_items.qc
  mutators/sandbox.qc
  mutators/mutator_superspec.qc