repo: resdb
action: commit
revision: 
path_from: 
revision_from: 178670c9d07696c77f10ea297a935b1dbb484ad0:
path_to: 
revision_to: 

commit 178670c9d07696c77f10ea297a935b1dbb484ad0
Merge: ad3ae37 d20b178
Author: sevil 
Date:   Wed Mar 2 17:32:35 2011 -0600

    Merge branch 'master' of git://git1.somerandomnick.ano

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

diff --cc doc/www.anonet2.org/public_pod/index.pod
index 0a4f72e82c8ccf7d495cf679b522b2084e8292b6,6001796fa4f33f55d5e79498d0ee0d7b10704835..f8ce59694cdc1108ad5c642e32e49005356063a7
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@@ -94,8 -93,8 +94,13 @@@ Z<>
++<<<<<<< HEAD
 + 
 + 
++=======
+  
+  
++>>>>>>> d20b178ca63541f88382891d3c1fb6bef9793bb7
   
-----END OF PAGE-----
IRCZ<>
L
L
L (Hidden IP, username and realname (note 2))
   
IRCZ<>
L
L
L (Hidden IP, username and realname (note 2))
   
IRCZ<>
L
L
L (Hidden IP, username and realname (note 2), and also blocks most CTCP messages)
IRCZ<>
L
L (Hidden IP, username and realname, custom nickname, SSL enabled)
IRCZ<>
L
L
L (Visible IP, username and realname)
IRCZ<>
L
L (Unknown)
IRCZ<>
L
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>
L (Visible IP, username and realname)
IRCZ<>
L
L
L (Unknown)
   
TelnetZ<>
L
L (Hidden IP and username, custom nickname)
   
JabberZ<>
irc.somerandomnick.ano (RendezVous MUC)
L (Hidden IP, username and realname, custom nickname)