Merge branch 'master' into Mario/showspecs

diff --cc qcsrc/client/main.qc
Simple merge

diff --cc qcsrc/server/cl_client.qc
index 1f92d24442c3bf10cc5944b346d49a85ae37713f,28d9c6c1a04895bc264ace6bbcd99182e44f6f89..c2a5877761c419c2aaa6adba704a371387198ae0
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1219,10 -1185,8 +1219,10 @@@ void ClientDisconnect(
        if (autocvar_sv_eventlog)
                GameLogEcho(strcat(":part:", ftos(this.playerid)));
  
-       Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, this.netname);
+       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_DISCONNECT, this.netname);
  
 +      SetSpectatee(this, NULL);
 +
      MUTATOR_CALLHOOK(ClientDisconnect, this);
  
        ClientState_detach(this);