Merge branch 'master' into next

* master:
  * Update docs

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -4,17 +4,13 @@ next
   * When 'mop' protection is on, deop all previously regular clients automatically.
   * Properly honor exemptions when kicking matched RBL clients
 
-1.3.2 - http://wraith.botpack.net/milestone/1.3.2
+1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
   * When a nick is released, start regaining as soon as it is witnessed to have been taken again
   * Wraith is now linked dynamically. This should improve binary compat.
     Compile on the oldest OS you want to support, and ensure newer ones have
     all necessary compat libraries.
-  * '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)
   * 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
   * cmd_mns_user now accepts multiple users (fixes #77)
@@ -30,6 +26,14 @@ next
   * FiSH message support added.
   * FiSH support for DH1080 key-exchange. 'keyx' command added to start from bot, and responds to key-exchanges.
 
+1.3.2 - http://wraith.botpack.net/milestone/1.3.2
+  * Misc bug fixes
+  * '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
+  * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart
   * Fixed parsing errors in .chanset