Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -4,7 +4,6 @@ next
   * Fix LASTON not being shared
   * Fix './wraith -V' not showing the updated HUB info
   * Fix hub startup not respecting changed HUB lines in config
-  * Really fix CAPS/COLOR flood detection not obeying x|x flags
 
 maint
   * Prevent crashing on startup if openssl can not be loaded
@@ -14,6 +13,7 @@ maint
   * Fix CALLERID not respecting ignores (#63)
   * 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
 
 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.