# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1328050387 0
# Node ID 69b37e794713fd79c2c49961314ec072a7f856c0
# Parent  59a311145ed0d20af168b069aadf7cdffa51b992# Parent  134e521e42bacde7f2920a89a4d7cd087fae0d19
Merge commit '31a73a0fd700f2e9aef4495cbeeee1b9becf4606'

diff -r 59a311145ed0 -r 69b37e794713 db/udpmsg4/cha/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/.gitignore	Tue Jan 31 22:53:07 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 59a311145ed0 -r 69b37e794713 db/udpmsg4/cha/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/default.key	Tue Jan 31 22:53:07 2012 +0000
@@ -0,0 +1,1 @@
+f252a3dd7ba44b76cd998ad0d22453d652682f47be6d6ea19039beaff00b801f
diff -r 59a311145ed0 -r 69b37e794713 db/udpmsg4/cha/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/owner	Tue Jan 31 22:53:07 2012 +0000
@@ -0,0 +1,1 @@
+dimitry
diff -r 59a311145ed0 -r 69b37e794713 db/udpmsg4/cha/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cha/@/path	Tue Jan 31 22:53:07 2012 +0000
@@ -0,0 +1,1 @@
+/cha