err.no Git - dpkg/commit

author	Raphael Hertzog <hertzog@debian.org>
	Mon, 8 Oct 2007 19:05:05 +0000 (21:05 +0200)
committer	Raphael Hertzog <hertzog@debian.org>
	Mon, 8 Oct 2007 19:05:05 +0000 (21:05 +0200)
commit	96e0c9b0f935d615abe247a297469bc57692dd1f
tree	e203249038909536daf87c6103485112d19e4215	tree \| snapshot
parent	2c20a5c29a46acd5d18c7960fff8e23fd555c510	commit \| diff
parent	6d66ede0563c13c1147e1763029012ca23cdc993	commit \| diff

Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

configure.ac
debian/changelog