]> err.no Git - dpkg/commit
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
authorChristian Perrier <bubulle@debian.org>
Thu, 6 Sep 2007 04:37:17 +0000 (06:37 +0200)
committerChristian Perrier <bubulle@debian.org>
Thu, 6 Sep 2007 04:37:17 +0000 (06:37 +0200)
commit227ecffffa426bdb71004003ca1ff51b73afd984
treec331af2080cf33753389be86f2ab72cfc5bcec85
parentfaf1411ff0462855ea26ee90bce16264fd8be418
parent3f0020be7eac8357f5ce53f978b63f1fd4181be2
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

debian/changelog
debian/changelog