Merge branch 'master' into next

* master:
  * Remove irc.efnet.ch and add irc.underworld.no

doc/UPDATES

@@ -4,6 +4,7 @@
 * Only global +n can use .chanset * now
 * cmd_die no longer puts user's nick into the quit msg.
 * Update rbl list, 'set -yes rbl-servers -' to get new list.
+* Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
 * Fix problems with changing IP
 * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
 

doc/settings.txt

@@ -33,12 +33,12 @@ efnet.port80.se
 efnet.xs4all.nl
 irc.ac.za
 irc.du.se
-irc.efnet.ch
 irc.efnet.fr
 irc.efnet.nl
 irc.efnet.pl
 irc.homelien.no
 irc.inet.tele.dk
+irc.underworld.no
 #CA
 irc.arcti.ca
 irc.choopa.ca
@@ -50,7 +50,6 @@ efnet.ipv6.xs4all.nl
 irc.ac.za
 irc.choopa.ca
 irc.choopa.net
-irc.efnet.ch
 irc.efnet.nl
 irc.ipv6.he.net
 irc.ipv6.homelien.no