# HG changeset patch
# User icann <icann@icann.ano>
# Date 1346570675 0
# Node ID 03060fa594b1ce494e0b58bffec881d6ae5f839b
# Parent  c3bf76d62a4b3cb0848c85a8e12f17c81e473ac0# Parent  11ecd49052076ab47d6cb442a66898707066e170
Merge branch 'master' of git://git1.srn.ano

diff -r c3bf76d62a4b -r 03060fa594b1 db/udpmsg4/spoofnet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/.gitignore	Sun Sep 02 07:24:35 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r c3bf76d62a4b -r 03060fa594b1 db/udpmsg4/spoofnet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/default.key	Sun Sep 02 07:24:35 2012 +0000
@@ -0,0 +1,1 @@
+274f2f5e8ce51d9837b7aa4495e60cd62883d8a131d4af71324d84a0e3820503
diff -r c3bf76d62a4b -r 03060fa594b1 db/udpmsg4/spoofnet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/owner	Sun Sep 02 07:24:35 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r c3bf76d62a4b -r 03060fa594b1 db/udpmsg4/spoofnet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/path	Sun Sep 02 07:24:35 2012 +0000
@@ -0,0 +1,1 @@
+/spoofnet