Merge branch 'master' into next

* master:
  1.4.10 Release
  Update server list

doc/UPDATES.md

@@ -19,7 +19,7 @@
   * Sort cmd_groups and cmd_bots better.
   * cmd_groups: Indicate which bots are down with a _*_.
 
-# maint
+# 1.4.10
   * Clear FiSH keys when a client quits.
   * Fix crash when clearing last botset entry for a bot.
   * Bots now share channel key to other bots even if not opped.

doc/settings.txt

@@ -19,7 +19,6 @@ irc.choopa.net
 irc.colosolutions.net
 irc.mzima.net
 irc.servercentral.net
-irc2.choopa.net
 #EU
 efnet.port80.se
 efnet.portlane.se
@@ -44,6 +43,7 @@ irc.choopa.net:9999
 irc.servercentral.net:9999
 irc.underworld.no
 irc.nordunet.se
+efnet.port80.se
 
 :servers6_ssl
 irc.choopa.net:9999