[Forensics-changes] [SCM] debian-forensics/md5deep branch, debian, updated. debian/3.7-1-17-g57d86cd

[Julien Valroff]

The following commit has been merged in the debian branch:
commit ca6c47f49496bc7ad53ff1c282ad4cb0567a0ed9
Merge: a0829938549437de4a310db477942037919d9aec ac1e1313f0533951ea70303f84447363d4849bfd
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Jun 3 07:36:47 2011 +0200

    Merge commit 'upstream/3.9.1' into debian
    
    Conflicts:
    	ChangeLog
    	NEWS
    	aclocal.m4
    	common/hash.c
    	configure
    	configure.ac
    	hashdeep/Makefile.in
    	hashdeep/hashdeep.1
    	md5deep/files.c
    	md5deep/md5deep.1
    	md5deep/sha1deep.1
    	md5deep/sha256deep.1
    	md5deep/tigerdeep.1
    	md5deep/whirlpooldeep.1


-- 
debian-forensics/md5deep