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

diff -r 2dd83e65226a -r e462f80a2e39 db/udpmsg4/CA2/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/.gitignore	Tue Nov 15 13:31:30 2011 -0500
@@ -0,0 +1,1 @@
+temp.keys
diff -r 2dd83e65226a -r e462f80a2e39 db/udpmsg4/CA2/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/default.key	Tue Nov 15 13:31:30 2011 -0500
@@ -0,0 +1,1 @@
+d81cb67b5dd7ef5e8e7ff6d0d63fe7a4be7bdf19d5510392c6b33639ddd84e32
diff -r 2dd83e65226a -r e462f80a2e39 db/udpmsg4/CA2/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/owner	Tue Nov 15 13:31:30 2011 -0500
@@ -0,0 +1,1 @@
+pikaj00
diff -r 2dd83e65226a -r e462f80a2e39 db/udpmsg4/CA2/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/path	Tue Nov 15 13:31:30 2011 -0500
@@ -0,0 +1,1 @@
+/CA2