Merge branch 'bitch-changes' into next

* bitch-changes:
  * Change +bitch reaction to use normal queue for deopping opper/opped clients

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -5,6 +5,7 @@ next
   * Fix 'mop' causing a mass deop when -bitch
   * Properly honor exemptions when kicking matched RBL clients
   * Don't kick friendly bots that are desynced: op them.
+  * Change +bitch reaction to use normal queue for deopping opper/opped clients
 
 release
   * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick

src/mod/irc.mod/mode.c

@@ -586,12 +586,16 @@ got_op(struct chanset_t *chan, memberlist *m, memberlist *mv)
       size_t len = 0;
 /* should kick the oppee first, then deal with the opper */
 
+#ifdef old
       if (num == 4) {
         len = simple_snprintf(outbuf, sizeof(outbuf), "MODE %s -o %s\r\n", chan->name, mv->nick);
         mv->flags |= SENTDEOP;
       } else if (num == 5) {
         len = simple_snprintf(outbuf, sizeof(outbuf), "MODE %s -o %s\r\n", chan->name, m->nick);
         m->flags |= SENTDEOP;
+#endif
+      if (num == 5) {
+        add_mode(chan, '-', 'o', m->nick);
       } else if (bitch && num == 6) {
         len = simple_snprintf(outbuf, sizeof(outbuf), "KICK %s %s :%s\r\n", chan->name, mv->nick, response(RES_BITCHOPPED));
         mv->flags |= SENTKICK;