Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -4,13 +4,13 @@ next
   * Fix LASTON not being shared
   * Warn when using 'chattr +a' as some users may expect it to be auto-op
   * When using msg OP, check for and allow '#chan PASS' as well as 'PASS #chan'
-  * Fix CALLERID not respecting ignores (#63)
 
 maint
   * Prevent crashing on startup if openssl can not be loaded
   * Rename option -c to -m for 'manual' edit, and redirect -c to -C
   * Show a nicer compile error when BUILDTS unable to be determined / gmake is not used.
   * Show 'Do!' in 'chaninfo' for 'Voice-moderate' to be consistent with other flags.
+  * Fix CALLERID not respecting ignores (#63)
 
 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.