Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,14 +1,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
-  * Add [bot]set var 'groups' to configure what groups bots are in
-  * Add chanset 'groups' to take a list of groups that should join. 'chanset #chan groups { main backup }'
-  * Added group support to 'botcmd': 'botcmd %group cmd'
-  * 'botjoin' and 'botpart' have been removed. Just use .+chan, .chanset, .botset to control groups.
-  * Add command 'groups' to list all groups and which bots are in them.
-  * Command 'channels' now accepts a '%group' param to show which channels a group are in.
-  * Add '%group' support to 'bots' command.
-  * Improve output of 'bots' command by displaying and sorting nodename
 
 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.
@@ -30,6 +22,14 @@ next
   * Add cmd_newhub for adding a new hub. All bots will add this to their config.
   * Hubs can now be overridden inside the botconfig (-C)
   * Optimize userfile writing by doing it asynchronously
+  * Add [bot]set var 'groups' to configure what groups bots are in
+  * Add chanset 'groups' to take a list of groups that should join. 'chanset #chan groups { main backup }'
+  * Added group support to 'botcmd': 'botcmd %group cmd'
+  * 'botjoin' and 'botpart' have been removed. Just use .+chan, .chanset, .botset to control groups.
+  * Add command 'groups' to list all groups and which bots are in them.
+  * Command 'channels' now accepts a '%group' param to show which channels a group are in.
+  * Add '%group' support to 'bots' command.
+  * Improve output of 'bots' command by displaying and sorting nodename
 
 maint
   * Fix various compile warnings with newer GCC