# HG changeset patch
# User pikaj00 <pikaj00@gmail.com>
# Date 1320003510 14400
# Node ID a473b4839a88550276c3023dcb1db6263f962a79
# Parent  1f632b3423fc27cb9f9205d92c81ec44183f6bfd# Parent  a212369fcc6cd8797e9e0f57f44014ddbce16f11
Merge branch 'master' of git://git1.srn.ano

diff -r a212369fcc6c -r a473b4839a88 db/udpmsg4/CA2/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/.gitignore	Sun Oct 30 15:38:30 2011 -0400
@@ -0,0 +1,1 @@
+temp.keys
diff -r a212369fcc6c -r a473b4839a88 db/udpmsg4/CA2/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/default.key	Sun Oct 30 15:38:30 2011 -0400
@@ -0,0 +1,1 @@
+d81cb67b5dd7ef5e8e7ff6d0d63fe7a4be7bdf19d5510392c6b33639ddd84e32
diff -r a212369fcc6c -r a473b4839a88 db/udpmsg4/CA2/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/owner	Sun Oct 30 15:38:30 2011 -0400
@@ -0,0 +1,1 @@
+pikaj00
diff -r a212369fcc6c -r a473b4839a88 db/udpmsg4/CA2/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/CA2/@/path	Sun Oct 30 15:38:30 2011 -0400
@@ -0,0 +1,1 @@
+/CA2