Merge branch 'maint'

* maint:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,6 +1,4 @@
 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
   * 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)
@@ -22,6 +20,10 @@
 maint
   * Fix --disable-ipv6 compiling
   * Update cmd_mop to support console channel (so it works via Auth commands better)
+  * 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
+  * 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
 
 1.3.2 - http://wraith.botpack.net/milestone/1.3.2
   * Misc bug fixes