marcus committed to gpgme/gpgme

[cvs@cvs.gnupg.org]

Date:	Tuesday November 20, 2001 @ 7:03
Author:	marcus

Update of /cvs/gnupg/gpgme/gpgme
In directory trithemius:/tmp/cvs-serv11327

Modified Files:
	ChangeLog 
Log Message:
remove some CVS conflict cruft

File: ChangeLog        	Status: Up-to-date