# HG changeset patch
# User root <root@HAL2000.(none)>
# Date 1288146377 18000
# Node ID abee74e3817dc91afe99a4b65627a9138e3a8058
# Parent  f983a3b6a7ab611e7aedd637018d9c3c019ea1b9# Parent  e02a20171ee05426df1a22893cd95958c3fde33e
Merge branch 'master' of git://git1.somerandomnick.ano

Conflicts:
	doc/www.anonet2.org/public_pod/index.pod

diff -r f983a3b6a7ab -r abee74e3817d doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Tue Oct 26 18:13:42 2010 -0500
+++ b/doc/www.anonet2.org/public_pod/index.pod	Tue Oct 26 21:26:17 2010 -0500
@@ -23,6 +23,7 @@
 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
@@ -35,6 +36,9 @@
 =======
 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)
@@ -58,12 +62,18 @@
 =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