# HG changeset patch
# User d3v11 <d3v11@d3v11.ano>
# Date 1343846182 -3600
# Node ID b473e0174ec960bff9364dd44990e26e9314b94a
# Parent  cfc7e2cbfd6393ba479f193f657988ee3d353226# Parent  96dd81a3c2989cf4ec06ee171b93c5fa4b3bf60e
Merge branch 'master' of git://1.6.0.5

diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/.gitignore	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+temp.keys
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/default.key	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+042e1a6f24b0847ceee261a9f213ffe1fa17dfd4e62348604cb2e2156ce20d3a
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/owner	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+icann
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/path	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+/IcannNet
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/Clandestine/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/.gitignore	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+temp.keys
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/Clandestine/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/default.key	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+3de75a1b61212b15838ebb57cc29dd5731d240cb83816894e761ccd0e1ef6d42
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/Clandestine/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/owner	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+d3v11
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/IcannNet/Clandestine/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/path	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+/IcannNet/Clandestine
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/NeXuS/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/.gitignore	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+temp.keys
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/NeXuS/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/default.key	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+ab6f47bcfd1a50ae62762bd94c4a8ec5e2b5bf60cb97aae2d4f52fa519fd447f
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/NeXuS/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/owner	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+mama
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/NeXuS/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/path	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+/NeXus
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/relayhell/WeeD/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/.gitignore	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+temp.keys
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/relayhell/WeeD/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/default.key	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+c26b04eaeadb83e256b915e911e4c3c3f52ba9dbd71cd226fc0ef3db08cb006c
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/relayhell/WeeD/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/owner	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+weed
diff -r 96dd81a3c298 -r b473e0174ec9 db/udpmsg4/relayhell/WeeD/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/path	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+/relayhell/WeeD