# HG changeset patch
# User root <root@ip-10-56-75-16.(none)>
# Date 1342925617 0
# Node ID 1a7aebf6d8dddfce57bc10363b9773210d948e98
# Parent  685205d9ec7a4f9a37bd75c1a480c6c8f68bdeed# Parent  d2aa32647e466ad774c540fa1ce1454a50ea3326
Merge branch 'master' of git://git1.srn.ano

diff -r d2aa32647e46 -r 1a7aebf6d8dd db/udpmsg4/IcannNet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/.gitignore	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r d2aa32647e46 -r 1a7aebf6d8dd db/udpmsg4/IcannNet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/default.key	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+042e1a6f24b0847ceee261a9f213ffe1fa17dfd4e62348604cb2e2156ce20d3a
diff -r d2aa32647e46 -r 1a7aebf6d8dd db/udpmsg4/IcannNet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/owner	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+icann
diff -r d2aa32647e46 -r 1a7aebf6d8dd db/udpmsg4/IcannNet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/path	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+/IcannNet