Merge branch 'master' into mirceakitsune/nex_reticle

diff --combined defaultXonotic.cfg
index 32f5fbc4748331a60ced8a230b92866ce7a3473f,9edc772f299c76e27bb150f88a88aa136ed5ab13..5a66cb4baadbf0d561761eda21e70292627d55ca
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -206,7 -206,6 +206,7 @@@ seta crosshair_fireball_color_green 1.
  seta crosshair_fireball_color_blue 0.2        "crosshair color blue component to display when wielding the fireball"
  seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball"
  seta crosshair_fireball_size 1        "crosshair size when wielding the fireball"
 +seta cl_reticle_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
  fov 90
  seta cl_velocityzoom 0        "velocity based zooming of fov, negative values zoom out"
  seta cl_velocityzoomtime 0.3  "time value for averaging speed values"
@@@ -1036,7 -1035,7 +1036,7 @@@ bind kp_minus "+userbind 18
  set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted"
  set sv_vote_only_commands ""
  set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"        "maybe add kickban here (but then sv_vote_master 0)"
- set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"
+ set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"
  set sv_vote_call 1    "users can call a vote for the above commands"
  set sv_vote_master 1  "users can call a vote to become master"
  set sv_vote_master_password ""        "when set, users can use \"vlogin PASSWORD\" to log in as master"