Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -2,12 +2,10 @@
 * When a nick is released, start regaining as soon as it is witnessed to have been taken again
 * Fix cmd_relay so it does not use IPv6 if not supported.
 * Fix bot linking so it does not use IPv6 if not supported.
-* Fix auth IRC lookups getting the wrong cached idx
 * Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
 * When 'mdop' protection is on, re-op all previously opped clients automatically.
 * When 'mop' protection is on, deop all previously regular clients automatically.
 * Fix 'mop' causing a mass deop when -bitch
-* Fix bot going zombie if it jumps during a restart
 * Properly honor exemptions when kicking matched RBL clients
 
 * Fix crash related to slowpart
@@ -21,6 +19,8 @@
 * Ignore 'pflog' interfaces in promisc
 * Fix buffer overflow in DCC
 * Fix problems with changing IP
+* Fix bot going zombie if it jumps during a restart
+* Fix auth IRC lookups getting the wrong cached idx
 
 1.3 - http://wraith.botpack.net/milestone/1.3
 * Binary / shell / startup changes