Merge branch 'mop-bitch' into maint

* mop-bitch:
  * Update docs
  * Don't enforce_bitch() if mop is set and not +bitch

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -2,6 +2,7 @@ maint
   * 'make' on BSD will now redirect to gmake.
   * Fix partyline cmds for |m and |o users who do not have console set correctly. (.adduser)
   * Allow simulated terminal (HQ) user to access owners (ie, .chpass owner)
+  * Fix 'mop' causing a mass deop when -bitch
 
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart

src/mod/irc.mod/mode.c

@@ -1110,7 +1110,7 @@ gotmode(char *from, char *msg)
                 }
               }
               // Don't mass deop if protect is set, it'll happen anyway below
-              if (!channel_protect(chan))
+              if (channel_bitch(chan) && !channel_protect(chan))
                 enforce_bitch(chan);        /* deop quick! */
             }
             if (channel_protect(chan))