Merge branch 'maint'

* maint:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,9 +1,6 @@
 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.
   * 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)
@@ -27,6 +24,9 @@
   * Fix 'mop' causing a mass deop when -bitch
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
   * Don't kick friendly bots that are desynced: op them.
+  * 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.
 
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart