# HG changeset patch
# User pikaj00 <pikaj00@gmail.com>
# Date 1320097671 14400
# Node ID d7a53b077d58fc0194a3ad9b772039f07409c21e
# Parent  a473b4839a88550276c3023dcb1db6263f962a79# Parent  284cc8436997a347ffeb3bf5c778053a10d9d2f6
Merge branch 'master' of git://git1.srn.ano

diff -r 284cc8436997 -r d7a53b077d58 db/udpmsg4/CA2/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/.gitignore	Mon Oct 31 17:47:51 2011 -0400
@@ -0,0 +1,1 @@
+temp.keys
diff -r 284cc8436997 -r d7a53b077d58 db/udpmsg4/CA2/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/default.key	Mon Oct 31 17:47:51 2011 -0400
@@ -0,0 +1,1 @@
+d81cb67b5dd7ef5e8e7ff6d0d63fe7a4be7bdf19d5510392c6b33639ddd84e32
diff -r 284cc8436997 -r d7a53b077d58 db/udpmsg4/CA2/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/owner	Mon Oct 31 17:47:51 2011 -0400
@@ -0,0 +1,1 @@
+pikaj00
diff -r 284cc8436997 -r d7a53b077d58 db/udpmsg4/CA2/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/path	Mon Oct 31 17:47:51 2011 -0400
@@ -0,0 +1,1 @@
+/CA2