# HG changeset patch
# User icann <icann@icann.ano>
# Date 1355002363 0
# Node ID 6cd9a245e6c31ffc98f34f364e1b37d6b8b2b8ef
# Parent  2633c58cba4b3a5b6d0d39ed197d9e0565948648# Parent  f8416d7c3deb0fb2d9c08c164b7b602f14ea88e5
Merge branch 'master' of git://1.1.7.1

diff -r 2633c58cba4b -r 6cd9a245e6c3 db/udpmsg4/NTMA/@/.gitignore
--- /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
diff -r 2633c58cba4b -r 6cd9a245e6c3 db/udpmsg4/NTMA/@/default.key
--- /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
diff -r 2633c58cba4b -r 6cd9a245e6c3 db/udpmsg4/NTMA/@/owner
--- /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
diff -r 2633c58cba4b -r 6cd9a245e6c3 db/udpmsg4/NTMA/@/path
--- /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