dshaw committed to gnupg/g10

[cvs@cvs.gnupg.org]

Date:	Sunday May 5, 2002 @ 14:45
Author:	dshaw

Update of /cvs/gnupg/gnupg/g10
In directory trithemius:/tmp/cvs-serv17769

Modified Files:
      Tag: STABLE-BRANCH-1-0
	ChangeLog keyserver.c 
Log Message:
* 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.

File: ChangeLog        	Status: Up-to-date
File: keyserver.c      	Status: Up-to-date