Merge branch 'master' into next

* master:
  * Remove cbl.abuseat.org as it was for email only

doc/UPDATES

@@ -3,6 +3,7 @@
 * Fixed parsing errors in .chanset
 * 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.
 * 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

@@ -57,7 +57,6 @@ irc.ipv6.homelien.no
 irc.paraphysics.net
 
 :rbl
-cbl.abuseat.org
 dnsbl.ahbl.org
 dnsbl.proxybl.org
 rbl.efnetrbl.org