changeset 1072:6cd9a245e6c3 draft

Merge branch 'master' of git://1.1.7.1
author icann <icann@icann.ano>
date Sat, 08 Dec 2012 21:32:43 +0000
parents 2633c58cba4b (current diff) f8416d7c3deb (diff)
children 946ce856f3c2
files
diffstat 4 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NTMA/@/.gitignore	Sat Dec 08 21:32:43 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NTMA/@/default.key	Sat Dec 08 21:32:43 2012 +0000
@@ -0,0 +1,1 @@
+16ed26da82451f1f703b97e5d7668faf119fbf9ec9c5600858004399d6588661
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NTMA/@/owner	Sat Dec 08 21:32:43 2012 +0000
@@ -0,0 +1,1 @@
+talamon
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NTMA/@/path	Sat Dec 08 21:32:43 2012 +0000
@@ -0,0 +1,1 @@
+/NTMA