# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1328050354 0
# Node ID 59a311145ed0d20af168b069aadf7cdffa51b992
# Parent  8b28a5f63600816dc986cbd19444e26bd21f9ab0# Parent  a6d5b808e51a970656061d1e59fe2f56b5ef1363
Merge commit '9db016de8390665df792ecb8820b644009c95032'

diff -r 8b28a5f63600 -r 59a311145ed0 contrib/peer2anonet/peer2anonet
--- a/contrib/peer2anonet/peer2anonet	Sun Jan 29 09:22:15 2012 +0000
+++ b/contrib/peer2anonet/peer2anonet	Tue Jan 31 22:52:34 2012 +0000
@@ -495,6 +495,7 @@
     )
 
     echo 'export MAIL=~/Mailbox' >>/etc/profile
+    }
 
 INSTALL_DJBDNS(){
     echo -e '\nINSTALL DJBDNS:\n'
diff -r 8b28a5f63600 -r 59a311145ed0 doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Sun Jan 29 09:22:15 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Tue Jan 31 22:52:34 2012 +0000
@@ -60,10 +60,10 @@
  <tr><td>IRCZ<></td><td>L<SRN6 (tor)|irc://5ziqujry3yknhco2.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
  <tr><td>IRCZ<></td><td>L<SRN8 (tor)|irc://kvur4ogjijlvxsdm.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
  <tr><td>IRCZ<></td><td>L<sevilNatas (tor)|irc://p4hej3mnyqdtxwiu.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname (note 2))</td></tr>
+ <tr><td>IRCZ<></td><td>L<d3v11 (tor)|irc://rbb3cizcd23x7w4g.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
 <!--
  <tr><td>IRCZ<></td><td>L<UFO|irc://anortr.ucis.nl:8805/anonet></td><td>L<aooo|http://www.anonet2.org/irc_anonymity> (Hidden IP, visible username and realname)</td></tr>
  <tr><td>IRCZ<></td><td>L<UFO|irc://irc.kwaaknet.org:6667/anonet></td><td>L<nooo|http://www.anonet2.org/irc_anonymity> (Visible IP, username and realname (warning!))</td></tr>
- <tr><td>IRCZ<></td><td>L<d3v11 (tor)|irc://rbb3cizcd23x7w4g.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
 -->
 <!--
  <tr><td>TelnetZ<></td><td>L<SRN|telnet://anortr.ucis.nl:8803/></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP and username, custom nickname)</td></tr>