Merge branch 'update-efnet-servers'

* update-efnet-servers:
  * EFnet server list updates

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,5 +1,6 @@
 * Binary pass prompt has been changed to be more clear.
 * Fix uname checking on NetBSD and OpenBSD
+* EFnet server list updates
 
 1.2.16 - http://wraith.botpack.net/milestone/1.2.16
 * Add 'set altchars' so that alternative characters used for nicks can be changed. (fixes #418)

doc/settings.txt

@@ -31,7 +31,6 @@ irc.wh.verio.net
 irc2.choopa.net
 #EU
 efnet.cs.hut.fi
-efnet.demon.co.uk
 efnet.port80.se
 efnet.xs4all.nl
 irc.ac.za
@@ -46,12 +45,10 @@ irc.efnet.ru
 irc.homelien.no
 irc.inet.tele.dk
 irc.inter.net.il
-irc.pte.hu
 irc.swepipe.se
 #CA
 irc.arcti.ca
 irc.choopa.ca
-irc.dks.ca
 irc.igs.ca
 
 :servers6