repo: resdb
action: commit
revision: 
path_from: 
revision_from: 99193fb91cb802cd5be11c44f5c3e5af56ffa5c9:
path_to: 
revision_to: 

commit 99193fb91cb802cd5be11c44f5c3e5af56ffa5c9
Merge: eac4964 6ff01d7
Author: Nick 
Date:   Thu Oct 14 03:01:24 2010 +0000

    Merge git://1.0.49.10

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

diff --cc doc/www.anonet2.org/public_pod/index.pod
index 5d3e9811cd9186d82a89b67f3c6aa2d27ef85f2a,e6e3978213d6b0e45f5e44ad612fe547ed52ad9b..c9247dff4e7296e2448cafdbaa27c66531efa80a
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@@ -265,14 -265,10 +265,18 @@@ having to set anything up yourself)

  =item *

+ Webchat (looking to relay to IRC, L)
+ 
+ =item *
+ 
 +L (The real WikiLeaks may be down, but not our mirror!)
 +
 +=item *
 +
 +L
 +
 +=item *
 +
  Pastebin (without time-zone leaks, L)

  =item *

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