# HG changeset patch
# User pikaj00 <pikaj00@gmail.com>
# Date 1320716497 18000
# Node ID 53702c04e38d12335c7c413dbd65f7c7e0a9d578
# Parent  b2beefc4c2007720a2338b3edc1b894235dd6a4f# Parent  a94082db21e4eeead8936ef125b26213bd079b57
Merge branch 'master' of git://git1.srn.ano

diff -r a94082db21e4 -r 53702c04e38d db/udpmsg4/CA2/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/.gitignore	Mon Nov 07 20:41:37 2011 -0500
@@ -0,0 +1,1 @@
+temp.keys
diff -r a94082db21e4 -r 53702c04e38d db/udpmsg4/CA2/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/default.key	Mon Nov 07 20:41:37 2011 -0500
@@ -0,0 +1,1 @@
+d81cb67b5dd7ef5e8e7ff6d0d63fe7a4be7bdf19d5510392c6b33639ddd84e32
diff -r a94082db21e4 -r 53702c04e38d db/udpmsg4/CA2/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/owner	Mon Nov 07 20:41:37 2011 -0500
@@ -0,0 +1,1 @@
+pikaj00
diff -r a94082db21e4 -r 53702c04e38d db/udpmsg4/CA2/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/path	Mon Nov 07 20:41:37 2011 -0500
@@ -0,0 +1,1 @@
+/CA2