changeset 916:9d3294b4247c draft

Merge branch 'master' of git://1.79.2.1
author pikaj00 <pikaj00@gmail.com>
date Fri, 03 Feb 2012 21:51:26 -0500
parents 33ac726c804d (current diff) b6c4d21d9ac6 (diff)
children feb20bee2971
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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