# HG changeset patch
# User d3v11 <d3v11@d3v11.ano>
# Date 1321826620 21600
# Node ID 9c7634e70edb2f5023ebd54386f12f71e3550461
# Parent  d5f84b10e62cc88d00c702924ba6ec8fc97d91c5# Parent  02a1254affc112f1cc1f1e561b8c92ccdb9b185f
Merge branch 'master' of git://git1.srn.ano

diff -r d5f84b10e62c -r 9c7634e70edb db/dom/ano/jcs/ns/ns2.jcs.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/jcs/ns/ns2.jcs.ano	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+1.3.14.65
diff -r d5f84b10e62c -r 9c7634e70edb db/ip/01/03/0E/ns/ns1.jcs.ano
--- a/db/ip/01/03/0E/ns/ns1.jcs.ano	Sun Nov 20 06:05:22 2011 -0600
+++ b/db/ip/01/03/0E/ns/ns1.jcs.ano	Sun Nov 20 16:03:40 2011 -0600
@@ -1,1 +0,0 @@
-1.3.14.15
diff -r d5f84b10e62c -r 9c7634e70edb db/ip/01/03/0E/ns/ns2.jcs.ano
diff -r d5f84b10e62c -r 9c7634e70edb db/ip/01/03/0F/ns/ns1.jcs.ano
--- a/db/ip/01/03/0F/ns/ns1.jcs.ano	Sun Nov 20 06:05:22 2011 -0600
+++ b/db/ip/01/03/0F/ns/ns1.jcs.ano	Sun Nov 20 16:03:40 2011 -0600
@@ -1,1 +0,0 @@
-1.3.14.15
diff -r d5f84b10e62c -r 9c7634e70edb db/ip/01/03/0F/ns/ns2.jcs.ano
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/A1/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A1/@/.gitignore	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+temp.keys
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/A1/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A1/@/default.key	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+fcde3e34f6210d6de57d2bc6702b9b1a2f89d685f394feda913a5740316c8508
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/A1/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A1/@/owner	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+somerandomnick
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/A1/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/A1/@/path	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+/A1
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/CA2/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/.gitignore	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+temp.keys
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/CA2/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/default.key	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+d81cb67b5dd7ef5e8e7ff6d0d63fe7a4be7bdf19d5510392c6b33639ddd84e32
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/CA2/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/owner	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+pikaj00
diff -r d5f84b10e62c -r 9c7634e70edb db/udpmsg4/CA2/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/path	Sun Nov 20 16:03:40 2011 -0600
@@ -0,0 +1,1 @@
+/CA2
diff -r d5f84b10e62c -r 9c7634e70edb db/usr/JCS/git
--- a/db/usr/JCS/git	Sun Nov 20 06:05:22 2011 -0600
+++ b/db/usr/JCS/git	Sun Nov 20 16:03:40 2011 -0600
@@ -1,1 +1,1 @@
-git://1.3.14.15/
+git://git.jcs.ano/resdb
diff -r d5f84b10e62c -r 9c7634e70edb doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Sun Nov 20 06:05:22 2011 -0600
+++ b/doc/www.anonet2.org/public_pod/index.pod	Sun Nov 20 16:03:40 2011 -0600
@@ -5,6 +5,8 @@
 =for comment
 You can read more information about AnoNet below, or on L<http://wiki.ucis.nl/Anonet>.
 
+Join us in chat for more information right now by loading L<http://client.thruhere.net:9090> enter your nick and #anonet.
+
 =head2 Theory
 
 =over
diff -r d5f84b10e62c -r 9c7634e70edb git-commit
--- a/git-commit	Sun Nov 20 06:05:22 2011 -0600
+++ b/git-commit	Sun Nov 20 16:03:40 2011 -0600
@@ -1,4 +1,4 @@
 #!/bin/sh
 git add configure db doc git-commit gitd scripts contrib .gitignore
-git commit
+TZ=UTC git commit --date="`date -u +'%s'`"
 test -x /usr/lib/git-core/git-update-server-info && /usr/lib/git-core/git-update-server-info