[xml/sgml-commit] CVS update: packages/expat/debian
   
    Ardo van Rangelrooij
     
    ardo@haydn.debian.org
       
    Sun, 17 Oct 2004 20:14:39 -0600
    
    
  
Date:	Sunday October 17, 2004 @ 20:14
Author:	ardo
Update of /cvsroot/debian-xml-sgml/packages/expat/debian
In directory haydn:/tmp/cvs-serv1903/debian
Modified Files:
	changelog 
Log Message:
resolved merge conflicts
===================================================================
File: changelog        	Status: Up-to-date
   Working revision:	1.4	Mon Oct 18 02:14:36 2004
   Repository revision:	1.4	/cvsroot/debian-xml-sgml/packages/expat/debian/changelog,v
   Existing Tags:
	debian_version_1_95_6-8  	(revision: 1.3)
	debian_version_1_95_6-7  	(revision: 1.2)
	debian_version_1_95_6-6  	(revision: 1.1)