# 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 aaf2e414c17d -r 0a759b6c7a58 db/udpmsg4/terranet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/terranet/@/.gitignore	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r aaf2e414c17d -r 0a759b6c7a58 db/udpmsg4/terranet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/terranet/@/default.key	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+510212db2ecf094fd774847b07c16e9dc116f2c315fb7f326bbf47eb03856e64
diff -r aaf2e414c17d -r 0a759b6c7a58 db/udpmsg4/terranet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/terranet/@/owner	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r aaf2e414c17d -r 0a759b6c7a58 db/udpmsg4/terranet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/terranet/@/path	Thu Aug 30 05:17:40 2012 +0000
@@ -0,0 +1,1 @@
+/terranet