# HG changeset patch
# User icann <icann@icann.ano>
# Date 1348329439 0
# Node ID cd6c3110c354679eb79fee7f3bf995b6a3d32f9d
# Parent  48b9a040a04bc7ac2b99d1f3ecd930e82388a37c# Parent  4b4db105ae32bb4efd07332c6826525f6fb463e5
Merge branch 'master' of git://git1.srn.ano

diff -r 48b9a040a04b -r cd6c3110c354 db/udpmsg4/cynet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cynet/@/.gitignore	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 48b9a040a04b -r cd6c3110c354 db/udpmsg4/cynet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cynet/@/default.key	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+1575b144ca67f0acefd14deffd5969e2389e590b42e06636bba17dcd443bc361
diff -r 48b9a040a04b -r cd6c3110c354 db/udpmsg4/cynet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cynet/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+anonfive
diff -r 48b9a040a04b -r cd6c3110c354 db/udpmsg4/cynet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cynet/@/path	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+/cynet