Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --combined qcsrc/server/autocvars.qh
index e32fa17f6ee2ef5f006b0bc4a490b567f1de61f6,dee1727fc1c078f7b2e58f8d90c82cf45a821525..aba995487208082b9eb4e7ffc6b14210a559f725
--- 1/qcsrc/server/autocvars.qh
--- 2/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -900,10 -900,10 +900,10 @@@ float autocvar_g_nexball_goalleadlimit
  float autocvar_g_nexball_radar_showallplayers;
  float autocvar_g_nexball_sound_bounce;
  float autocvar_g_nexball_trail_color;
- float autocvar_g_nick_flood_penalty;
+ //float autocvar_g_nick_flood_penalty;
  float autocvar_g_nick_flood_penalty_red;
  float autocvar_g_nick_flood_penalty_yellow;
- float autocvar_g_nick_flood_timeout;
+ //float autocvar_g_nick_flood_timeout;
  float autocvar_g_nix_with_healtharmor;
  float autocvar_g_nix_with_laser;
  float autocvar_g_nix_with_powerups;
@@@ -1052,7 -1052,6 +1052,7 @@@ float autocvar_minplayers
  string autocvar_nextmap;
  float autocvar_prvm_backtraceforwarnings;
  string autocvar_quit_and_redirect;
 +float autocvar_quit_and_redirect_timer;
  float autocvar_quit_when_empty;
  float autocvar_r_showbboxes;
  float autocvar_rescan_pending;
@@@ -1163,7 -1162,7 +1163,7 @@@ string autocvar_sv_vote_master_password
  float autocvar_sv_vote_master_playerlimit;
  float autocvar_sv_vote_no_stops_vote;
  float autocvar_sv_vote_nospectators;
- string autocvar_sv_vote_only_commands;
+ //string autocvar_sv_vote_only_commands;
  float autocvar_sv_vote_override_mostrecent;
  float autocvar_sv_vote_singlecount;
  float autocvar_sv_vote_stop;