Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -4,13 +4,13 @@ next
   * When 'mop' protection is on, deop all previously regular clients automatically.
   * Fix 'mop' causing a mass deop when -bitch
   * Properly honor exemptions when kicking matched RBL clients
-  * 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.
 
 release
   * 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.
 
 maint
   * 'make' on BSD will now redirect to gmake.