Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -3,9 +3,6 @@ next
   * Properly honor exemptions when kicking matched RBL clients
   * Fix LASTON not being shared
   * Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
-  * Bots now auto-reop other bots that get deopped
-  * Bots now ask for ops quicker if another bot is opped
-  * Bots now request/join +ilk channels much quicker
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
@@ -40,6 +37,9 @@ next
   * Improve output of 'bots' command by displaying and sorting nodename
   * Minus chrec if .chattr set no flags
   * Added 'chanset +floodban' to ban clients that violate 'flood-chan' and 'flood-ctcp'
+  * Bots now auto-reop other bots that get deopped
+  * Bots now ask for ops quicker if another bot is opped
+  * Bots now request/join +ilk channels much quicker
 
 maint
   * Fix various compile warnings with newer GCC