# HG changeset patch
# User pikaj00 <pikaj00@gmail.com>
# Date 1320445482 14400
# Node ID b2beefc4c2007720a2338b3edc1b894235dd6a4f
# Parent  d7a53b077d58fc0194a3ad9b772039f07409c21e# Parent  4b877b837beea72aca96017c7f6c06bc62c00184
Merge branch 'master' of git://git1.srn.ano

diff -r 4b877b837bee -r b2beefc4c200 db/udpmsg4/CA2/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/.gitignore	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+temp.keys
diff -r 4b877b837bee -r b2beefc4c200 db/udpmsg4/CA2/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/default.key	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+d81cb67b5dd7ef5e8e7ff6d0d63fe7a4be7bdf19d5510392c6b33639ddd84e32
diff -r 4b877b837bee -r b2beefc4c200 db/udpmsg4/CA2/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/owner	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+pikaj00
diff -r 4b877b837bee -r b2beefc4c200 db/udpmsg4/CA2/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/path	Fri Nov 04 18:24:42 2011 -0400
@@ -0,0 +1,1 @@
+/CA2