Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -3,11 +3,7 @@ next
   * When 'mdop' protection is on, re-op all previously opped clients automatically.
   * When 'mop' protection is on, deop all previously regular clients automatically.
   * Properly honor exemptions when kicking matched RBL clients
-  * Added SSL support
-    This includes new set options: 'servers-ssl', 'servers6-ssl', 'server-port-ssl', 'server-use-ssl'
-  * libcrypto (openssl) is now loaded at startup and is required.
   * Suicide will now remove all bots related to the binary being removed (fixes #435)
-  * Added TCL support. This is *only* a .tcl command currently, no scripts are loadable yet.
 
 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
@@ -26,6 +22,10 @@ next
   * Permanent owners can no longer be removed via cmd_mns_user
   * Fix +take clearing -fastop (fixes #371)
   * Added botbitch to mmode (fixes #139)
+  * Added SSL support
+    This includes new set options: 'servers-ssl', 'servers6-ssl', 'server-port-ssl', 'server-use-ssl'
+  * libcrypto (openssl) is now loaded at startup and is required.
+  * Added TCL support. This is *only* a .tcl command currently, no scripts are loadable yet.
 
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart