Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -2,15 +2,15 @@ next
   * Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
   * Properly honor exemptions when kicking matched RBL clients
   * Fix LASTON not being shared
-  * Bots linking in must now have a matching host on their user to succeed linking.
-    This was always requiring a valid host, but was not restricted to that bot.
   * Fix backwards compatibility with older 1.2/1.3 bots
-  * Fix leaf bots being able to initiate userfile transfer to hubs
-  * Protect binary updates so that only hubs can offer/send them
 
 maint
   * Default 'set promisc' to ignore since it's usually a false positive
     and doesn't matter much.
+  * Bots linking in must now have a matching host on their user to succeed linking.
+    This was always requiring a valid host, but was not restricted to that bot.
+  * Fix leaf bots being able to initiate userfile transfer to hubs
+  * Protect binary updates so that only hubs can offer/send them
 
 1.4.2 - http://wraith.botpack.net/milestone/1.4.2
   * Prevent crashing on startup if openssl can not be loaded