aboutsummaryrefslogtreecommitdiffstats
path: root/g10/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'g10/ChangeLog')
-rw-r--r--g10/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7cb0532cb..2dafe2d15 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-05 David Shaw <[email protected]>
+
+ * keyserver.c (keyserver_refresh): --refresh-keys implies
+ --merge-only so as not to import keys with keyids that match the
+ ones being refreshed. Noted by Florian Weimer.
+
2002-05-04 Stefan Bellon <[email protected]>
* free-packet.c (copy_public_key): Don't call m_alloc(0), therefore