changeset 973:b473e0174ec9 draft

Merge branch 'master' of git://1.6.0.5
author d3v11 <d3v11@d3v11.ano>
date Wed, 01 Aug 2012 19:36:22 +0100
parents cfc7e2cbfd63 (current diff) 96dd81a3c298 (diff)
children 0aa847a79036
files
diffstat 5 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lucifer/ns/a.ns.lucifer.ano	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+1.6.0.12
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lucifer/owner	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+lucifer
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/06/00/cidr	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+1.6.0.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/06/00/owner	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+lucifer
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/lucifer/git	Wed Aug 01 19:36:22 2012 +0100
@@ -0,0 +1,1 @@
+git://1.6.0.5/