Merge branch 'master' into next

* master:
  * Use 'requested' for quit msg via cmd_die

doc/UPDATES

@@ -2,6 +2,7 @@
 * Properly honor exemptions when kicking matched RBL clients
 * Fixed parsing errors in .chanset
 * Only global +n can use .chanset * now
+* cmd_die no longer puts user's nick into the quit msg.
 * Fix problems with changing IP
 * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
 

src/cmds.c

@@ -1991,7 +1991,7 @@ static void cmd_die(int idx, char *par)
   } else {
     simple_snprintf(s1, sizeof s1, "BOT SHUTDOWN (Authorized by %s)", dcc[idx].nick);
     simple_snprintf(s2, sizeof s2, "DIE BY %s!%s (request)", dcc[idx].nick, dcc[idx].host);
-    strlcpy(quit_msg, dcc[idx].nick, 1024);
+    strlcpy(quit_msg, "requested", 1024);
   }
   kill_bot(s1, s2);
 }