# HG changeset patch
# User pragmo <pragmo@pragmo.ano>
# Date 1288238158 0
# Node ID 13a2bda2804720184be509efdbb9862f41a52cbd
# Parent  f03efd72f05731a42b744bfc8d1f08d1e83f4881# Parent  c4cad8756f8438c21c20f25620d44174c3ec943d
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r f03efd72f057 -r 13a2bda28047 db/usr/UFO/git
diff -r f03efd72f057 -r 13a2bda28047 doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Thu Oct 28 02:55:59 2010 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Oct 28 03:55:58 2010 +0000
@@ -20,10 +20,7 @@
 =over
 
 =item webchat
-L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity)
 
 =item webchat
@@ -33,23 +30,22 @@
 =item webchat
 
 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity)
-=======
-L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
->>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
-=======
-L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
->>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
 
 =item IRC chat
-L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity)
+
+L<SRN|telnet://ufo-net.nl:2324/> (hides your identity)
 
-L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity)
+=item IRC chat
 
-L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity)
+L<UFO|telnet://ufo-net.nl:2325/> (partly hides your identity)
 
 =item telnet chat
 
-L<SRN|telnet://anortr.ucis.nl:8803> (hides your identity)
+L<SRN|telnet://ufo-net.nl:2323/> (hides your identity)
+
+=item IRC chat
+
+L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity)
 
 =back
 
@@ -61,19 +57,7 @@
 
 =item webchat
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
-=======
-L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
-
-L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
->>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
-=======
-L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
-
-L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
->>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
 
 =item IRC
 
@@ -81,8 +65,12 @@
 (L<SRN|irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for some
 reason) (automatically hides your identity)
 
+=item IRC
+
 L<KwaakNet|irc://1.3.3.7:6667/anonet> (doesn't automatically hide your identity)
 
+=item IRC
+
 L<pragmo|irc://irc.pragmo.ano:6667/atomic>
 (L<pragmo|irc://1.0.16.111:6667/atomic>, for the same reason as before
 and if you want you can use SSL on port 6697) (doesn't automatically