Merge branch 'master' into Mario/monsters

diff --cc commands.cfg
Simple merge

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
index aa69aaa477ee334dce688bfe387335a672743038,ba9b48a294a7ea5f9bc4bbda9eff993f0c8168b2..b7256deed443aafafa2dc3c76b53a3bf79ff2245
--- 1/qcsrc/server/command/sv_cmd.qc
--- 2/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@@ -1773,10 -1721,8 +1773,9 @@@ void GameCommand_(float request
  // ==================================
  
  // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
- // Common commands have double indentation to separate them a bit.
  #define SERVER_COMMANDS(request,arguments,command) \
        SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \
 +      SERVER_COMMAND("butcher", GameCommand_butcher(request), "Instantly removes all monsters on the map") \
        SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \
        SERVER_COMMAND("allspec", GameCommand_allspec(request, arguments), "Force all players to spectate") \
        SERVER_COMMAND("anticheat", GameCommand_anticheat(request, arguments), "Create an anticheat report for a client") \

diff --cc qcsrc/server/mutators/gamemode_ctf.qc
Simple merge