Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -2,10 +2,7 @@ next
   * Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
   * When 'mdop' protection is on, re-op all previously opped clients automatically.
   * When 'mop' protection is on, deop all previously regular clients automatically.
-  * 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
 
 1.3.2 - http://wraith.botpack.net/milestone/1.3.2
   * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
@@ -17,6 +14,9 @@ next
   * 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)
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+  * Fix 'mop' causing a mass deop when -bitch
+  * Don't kick friendly bots that are desynced: op them.
+  * Change +bitch reaction to use normal queue for deopping opper/opped clients
 
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart