Merge branch 'master' into next

* master:
  irc.wh.verio.net has delinked
  Fix logic to allow 5

doc/settings.txt

@@ -23,7 +23,6 @@ irc.paraphysics.net
 irc.servercentral.net
 irc.shoutcast.com
 irc.umich.edu
-irc.wh.verio.net
 irc2.choopa.net
 #EU
 efnet.cs.hut.fi

src/conf.c

@@ -697,7 +697,7 @@ readconf(const char *fname, int bits)
     }
   }                             /* while(fgets()) */
 
-  if (bots >= 5)
+  if (bots > 5)
     werr(ERR_TOOMANYBOTS);
 
   delete stream;