# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1343881589 0
# Node ID 31f385b787ab49c7b4c1fa73261fe1b2374051bb
# Parent  dd25621209512641ce1ce6b1c384447d9baad8e8# Parent  2197040ef7cbe1bc01b7d3213c4281dc5096dd74
Merge git://1.1.7.1

diff -r 2197040ef7cb -r 31f385b787ab db/dom/ano/lucifer/ns/a.ns.lucifer.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lucifer/ns/a.ns.lucifer.ano	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+1.6.0.12
diff -r 2197040ef7cb -r 31f385b787ab db/dom/ano/lucifer/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lucifer/owner	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+lucifer
diff -r 2197040ef7cb -r 31f385b787ab db/ip/01/06/00/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/06/00/cidr	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+1.6.0.0/24
diff -r 2197040ef7cb -r 31f385b787ab db/ip/01/06/00/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/06/00/owner	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+lucifer
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/freenet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenet/@/.gitignore	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/freenet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenet/@/default.key	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+2997782812501d79bd32f1dbaf7b4682ecfba0ec4241521f8dae474c823d1d0e
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/freenet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenet/@/owner	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+SeekingFor
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/freenet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenet/@/path	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+/freenet
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/sfor/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/sfor/@/.gitignore	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/sfor/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/sfor/@/default.key	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+27f91ab3cb1fd317499a1da5f8aaefea08e967784497f69e58e1b38570acc655
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/sfor/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/sfor/@/owner	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+SeekingFor
diff -r 2197040ef7cb -r 31f385b787ab db/udpmsg4/sfor/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/sfor/@/path	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+/sfor
diff -r 2197040ef7cb -r 31f385b787ab db/usr/lucifer/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/lucifer/git	Thu Aug 02 04:26:29 2012 +0000
@@ -0,0 +1,1 @@
+git://1.6.0.5/