Merge branch 'maint'

* maint:
  * Update docs

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,8 +1,6 @@
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
   * Change +bitch reaction to use normal queue for deopping opper/opped clients
-  * cmd_mns_user now accepts multiple users (fixes #77)
-  * 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
@@ -24,6 +22,9 @@ maint
   * When a nick is released, start regaining as soon as it is witnessed to have been taken again
   * 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
+  * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+  * cmd_mns_user now accepts multiple users (fixes #77)
+  * Permanent owners can no longer be removed via cmd_mns_user
 
 1.3.2 - http://wraith.botpack.net/milestone/1.3.2
   * Misc bug fixes