# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1343883043 0
# Node ID 66af8a3db38c816f3e7b088fcd0bfae08e8addc0
# Parent  31f385b787ab49c7b4c1fa73261fe1b2374051bb# Parent  98901f8a15ab28509e56bcf03f71cddb76abdf49
Merge git://1.1.7.1

diff -r 31f385b787ab -r 66af8a3db38c doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Thu Aug 02 04:26:29 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Aug 02 04:50:43 2012 +0000
@@ -62,7 +62,7 @@
  <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<NTMA (tor)|irc://uvqqv4xu22vfkhg2.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname(note 2))</td></tr>
+ <tr><td>IRCZ<></td><td>L<NTMA (tor)|irc://uvqqv4xu22vfkhg2.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<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>