Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -2,9 +2,6 @@ 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
-  * Fix './wraith -V' not showing the updated HUB info
-  * Fix hub startup not respecting changed HUB lines in config
-  * Support TCL 8.6 in the beta libtcl support (no scripting support yet)
 
 maint
   * Prevent crashing on startup if openssl can not be loaded
@@ -15,6 +12,9 @@ maint
   * When using msg OP, check for and allow '#chan PASS' as well as 'PASS #chan'
   * Warn when using 'chattr +a' as some users may expect it to be auto-op (#58)
   * Really fix CAPS/COLOR flood detection not obeying x|x flags
+  * Support TCL 8.6 in the beta libtcl support (no scripting support yet)
+  * Fix hub startup not respecting changed HUB lines in config
+  * Fix './wraith -V' not showing the updated HUB info
 
 1.4.1 - http://wraith.botpack.net/milestone/1.4.1
   * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.