# HG changeset patch
# User icann <icann@icann.ano>
# Date 1346303860 0
# Node ID 0a759b6c7a583bbf0a3855159c1f5987b444ed24
# Parent  aaf2e414c17dfefaeef6a897a8373fef14315627# Parent  ac8d4742e4ce45c2ec72cb07f5b9153969234ea2
Merge branch 'master' of git://git1.srn.ano

diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/.gitignore	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/default.key	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+042e1a6f24b0847ceee261a9f213ffe1fa17dfd4e62348604cb2e2156ce20d3a
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/owner	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+icann
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/path	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+/IcannNet
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/Clandestine/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/.gitignore	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/Clandestine/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/default.key	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+3de75a1b61212b15838ebb57cc29dd5731d240cb83816894e761ccd0e1ef6d42
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/Clandestine/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/owner	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+d3v11
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/IcannNet/Clandestine/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/path	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+/IcannNet/Clandestine
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/NeXuS/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/.gitignore	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/NeXuS/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/default.key	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+ab6f47bcfd1a50ae62762bd94c4a8ec5e2b5bf60cb97aae2d4f52fa519fd447f
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/NeXuS/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/owner	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+mama
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/NeXuS/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/path	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+/NeXus
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/relayhell/WeeD/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/.gitignore	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/relayhell/WeeD/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/default.key	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+c26b04eaeadb83e256b915e911e4c3c3f52ba9dbd71cd226fc0ef3db08cb006c
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/relayhell/WeeD/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/owner	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+weed
diff -r ac8d4742e4ce -r 0a759b6c7a58 db/udpmsg4/relayhell/WeeD/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/path	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+/relayhell/WeeD