Merge branch 'master' into next

* master:
  * Doc updates
  * Add new IPv6/SSL support for irc.underworld.no

doc/UPDATES

@@ -1,17 +1,21 @@
-* Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
-* When a nick is released, start regaining as soon as it is witnessed to have been taken again
-* Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
-* When 'mdop' protection is on, re-op all previously opped clients automatically.
-* When 'mop' protection is on, deop all previously regular clients automatically.
-* Fix 'mop' causing a mass deop when -bitch
-* Properly honor exemptions when kicking matched RBL clients
-* Wraith is now linked dynamically. This should improve binary compat.
-  Compile on the oldest OS you want to support, and ensure newer ones have
-  all necessary compat libraries.
-* Fix partyline cmds for |m and |o users who do not have console set correctly. (.adduser)
-* Allow simulated terminal (HQ) user to access owners (ie, .chpass owner)
-
-* 'make' on BSD will now redirect to gmake.
+next
+  * Bot will now jump from the server it's on if it is removed from the server list. (fixes a changing network bug)
+  * When 'mdop' protection is on, re-op all previously opped clients automatically.
+  * When 'mop' protection is on, deop all previously regular clients automatically.
+  * Fix 'mop' causing a mass deop when -bitch
+  * Properly honor exemptions when kicking matched RBL clients
+  * Wraith is now linked dynamically. This should improve binary compat.
+    Compile on the oldest OS you want to support, and ensure newer ones have
+    all necessary compat libraries.
+
+release
+  * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
+  * When a nick is released, start regaining as soon as it is witnessed to have been taken again
+
+maint
+  * 'make' on BSD will now redirect to gmake.
+  * Fix partyline cmds for |m and |o users who do not have console set correctly. (.adduser)
+  * Allow simulated terminal (HQ) user to access owners (ie, .chpass owner)
 
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart

doc/settings.txt

@@ -54,6 +54,7 @@ irc.efnet.nl
 irc.ipv6.he.net
 irc.ipv6.homelien.no
 irc.paraphysics.net
+irc.underworld.no
 
 :servers_ssl
 efnet.xs4all.nl
@@ -66,6 +67,7 @@ irc.paraphysics.net
 irc.servercentral.net
 irc.shoutcast.com
 irc.umich.edu
+irc.underworld.no
 
 :rbl
 dnsbl.ahbl.org