Merge branch 'master' into next

* master:
  efnet.cs.hut.fi is gone

doc/settings.txt

@@ -24,7 +24,6 @@ irc.servercentral.net
 irc.umich.edu
 irc2.choopa.net
 #EU
-efnet.cs.hut.fi
 efnet.port80.se
 efnet.portlane.se
 efnet.xs4all.nl