repo: resdb
action: commit
revision: 
path_from: 
revision_from: 65dc50fe32f3c4d6db0bd9ba0af4e075b56b9f9e:
path_to: 
revision_to: 

commit 65dc50fe32f3c4d6db0bd9ba0af4e075b56b9f9e
Merge: d09efc0 36678f0
Author: Nick 
Date:   Wed Sep 14 02:38:19 2011 +0000

    fixed d3v11* domains

    Merge commit '36678f0b96a9927354a44197113062802b826528'

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

diff --cc doc/www.anonet2.org/public_pod/index.pod
index a01d031b7d10be1ba3be26c8b66a36ed8de80549,a04a213bdf806ed1c59594f4bce8ec6575d5b360..349b8b83a8b532bf4813c2e9ea9dca1f457c7ea1
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@@ -55,14 -47,11 +55,15 @@@ Z<>
 + 
 +
 +
IRCZ<>
L
L (Hidden IP, username and realname (note 2))
   
IRCZ<>
L
L (Hidden IP, username and realname (note 2))
   
IRCZ<>
L
L (Hidden IP, username and realname (note 2))
IRCZ<>
L
L (Hidden IP, username and realname (note 2))

  

  =end xhtml

-----END OF PAGE-----