# HG changeset patch
# User sevil <sevil@sevilnatas.ano>
# Date 1301276997 0
# Node ID 8c5cbe73e1a888ac6307dea19c0c408a4285dd54
# Parent  9d55f301d21c962a65542ea3b186ed9ca7204cff# Parent  602f106dab0b2fd5615c95f8aa812640fe97bfd6
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/as/31415/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/31415/owner	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+JCS
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/as/31416/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/31416/owner	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+JCS
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/dom/ano/anomail/ns/ns.lynx.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/anomail/ns/ns.lynx.ano	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/dom/ano/anomail/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/anomail/owner	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+lex
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/dom/ano/jcs/ns/ns1.jcs.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/jcs/ns/ns1.jcs.ano	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+1.3.14.15
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/dom/ano/jcs/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/jcs/owner	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+JCS
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/dom/ano/lander/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/dom/ano/lander/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/dom/ano/lander/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lander/owner	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+lander
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/ip/01/03/0E/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/03/0E/cidr	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+1.3.14.0/24
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/ip/01/03/0E/ns/ns1.jcs.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/03/0E/ns/ns1.jcs.ano	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+1.3.14.15
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/ip/01/03/0E/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/03/0E/owner	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+JCS
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/ip/01/03/0F/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/03/0F/cidr	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+1.3.15.0/24
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/ip/01/03/0F/ns/ns1.jcs.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/03/0F/ns/ns1.jcs.ano	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+1.3.14.15
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/ip/01/03/0F/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/03/0F/owner	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+JCS
diff -r 9d55f301d21c -r 8c5cbe73e1a8 db/usr/JCS/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/JCS/git	Mon Mar 28 01:49:57 2011 +0000
@@ -0,0 +1,1 @@
+git://1.3.14.15/
diff -r 9d55f301d21c -r 8c5cbe73e1a8 doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Fri Mar 18 17:58:59 2011 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Mon Mar 28 01:49:57 2011 +0000
@@ -91,7 +91,7 @@
  <tr><td>HTTP WebChatZ<></td><td>L<sevilIRC (Relaying on #anoNet)|http://www.sevilnatas.ano/chat.html></td><td></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname (note 1))</td></tr>
  <tr><td>HTTP WebChatZ<></td><td>L<KwaakNet|http://anortr.ucis.ano:8086/?channels=anonet&nick=Anonymous></td><td>L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname (note 1))</td></tr>
  <tr><td>IRCZ<></td><td>L<SRN (NewNickNet)|irc://irc3.srn.ano:6667/anonet></td><td>L<SRN (NickNet)|irc://1.0.27.111:6667/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
- <tr><td>IRCZ<></td><td>L<SRN (NickNet)|irc://irc2.srn.ano:6667/anonet></td><td>L<SRN (NickNet)|irc://1.0.27.110:6667/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
+ <tr><td>IRCZ<></td><td>L<SRN (NickNet)|irc://irc4.srn.ano:6667/anonet></td><td>L<SRN (NickNet)|irc://1.0.27.114:6667/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
  <tr><td>IRCZ<></td><td>L<SRN|irc://irc.somerandomnick.ano:6667/RendezVous></td><td>L<SRN|irc://1.0.27.103:6667/RendezVous></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)</td></tr>
  <tr><td>IRCZ<></td><td>L<sevilNatas|irc://irc0.sevilnatas.ano:6667/anonet></td><td></td><td>L<aaao|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname, SSL enabled)</td></tr>
  <tr><td>IRCZ<></td><td>L<KwaakNet|irc://irc.kwaaknet.ano:6667/anonet></td><td>Server L<1|irc://1.3.3.7:6667/anonet>, L<2|irc://1.3.9.1:6667/anonet>, L<3|irc://1.3.3.8:6667/anonet></td><td>L<nooo|http://www.anonet2.org/irc_anonymity> (Visible IP, username and realname)</td></tr>
diff -r 9d55f301d21c -r 8c5cbe73e1a8 doc/www.anonet2.org/public_pod/services.pod
--- a/doc/www.anonet2.org/public_pod/services.pod	Fri Mar 18 17:58:59 2011 +0000
+++ b/doc/www.anonet2.org/public_pod/services.pod	Mon Mar 28 01:49:57 2011 +0000
@@ -32,7 +32,7 @@
 
 =item *
 
-L<IRC server on the udpmsg3 cloud (SRN)|irc://irc2.srn.ano/anonet> (runs L<SRN's improved version of UFO's package|http://www.srn.ano/udpmsg3/>)
+L<IRC server on the udpmsg4 cloud (SRN)|irc://irc4.srn.ano/anonet> (runs L<SRN's upgraded version of UFO's package|http://www.srn.ano/udpmsg4/ufo/ircd/>)
 
 =item *