Merge branch 'master' into next

* master:
  * Remove irc.efnet.nl as it has delinked

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -3,6 +3,9 @@ next
   * Properly honor exemptions when kicking matched RBL clients
   * Fix LASTON not being shared
 
+maint
+  * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+
 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.
   * Change +bitch reaction to use normal queue for deopping opper/opped clients

doc/settings.txt

@@ -33,7 +33,6 @@ efnet.xs4all.nl
 irc.ac.za
 irc.du.se
 irc.efnet.fr
-irc.efnet.nl
 irc.efnet.pl
 irc.homelien.no
 irc.inet.tele.dk
@@ -50,7 +49,6 @@ efnet.portlane.se
 irc.ac.za
 irc.choopa.ca
 irc.choopa.net
-irc.efnet.nl
 irc.inet.tele.dk
 irc.ipv6.homelien.no
 irc.ipv6.paraphysics.net