Merge remote-tracking branch 'origin/master' into samual/updatecommands

diff --cc commands.cfg
Simple merge

diff --cc qcsrc/client/command/cl_cmd.qc
index 687c6ae5908b45713b61c83844ad310d57d65a1d,acac8b3121574d22a2ec706a9f78849b5a404712..7926544d4b785d06c06aadf75377b0686c03c0a3
--- 1/qcsrc/client/command/cl_cmd.qc
--- 2/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@@ -307,8 -349,10 +349,9 @@@ void LocalCommand_(float request
  // ==================================
  
  // Normally do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
 -// but for 0.5 compat, we need vyes and vno here as they were replaced... REMOVE THEM AFTER 0.6 RELEASE!!!!
  #define CLIENT_COMMANDS(request,arguments) \
        CLIENT_COMMAND("blurtest", LocalCommand_blurtest(request), "Feature for testing blur postprocessing") \
+       CLIENT_COMMAND("create_scrshot_ent", LocalCommand_create_scrshot_ent(request), "Create an entity at this location for automatic screenshots") \
        CLIENT_COMMAND("debugmodel", LocalCommand_debugmodel(request, arguments), "Spawn a debug model manually") \
        CLIENT_COMMAND("handlevote", LocalCommand_handlevote(request, arguments), "System to handle selecting a vote or option") \
        CLIENT_COMMAND("hud", LocalCommand_hud(request, arguments), "Commands regarding/controlling the HUD system") \

diff --cc qcsrc/server/command/banning.qc
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge