# HG changeset patch
# User pikaj00 <pikaj00@gmail.com>
# Date 1328323886 18000
# Node ID 9d3294b4247c3fc3941a4388183bd2270b8ef75e
# Parent  33ac726c804d9342aea83e7308f14a665b67bfaf# Parent  b6c4d21d9ac61aef4af2a52675b693a0a71722f1
Merge branch 'master' of git://1.79.2.1

diff -r 33ac726c804d -r 9d3294b4247c db/udpmsg4/A666/@/default.key
--- a/db/udpmsg4/A666/@/default.key	Fri Feb 03 21:45:28 2012 -0500
+++ b/db/udpmsg4/A666/@/default.key	Fri Feb 03 21:51:26 2012 -0500
@@ -1,1 +1,1 @@
-cat ../pubkey
+6c231ab34012402bce793624047c2eddceab222d48f41c318d9e90078d5da33c