]> err.no Git - dpkg/commit
Merge branch 'master' into parsechangelog
authorFrank Lichtenheld <djpig@debian.org>
Thu, 6 Dec 2007 03:56:16 +0000 (04:56 +0100)
committerFrank Lichtenheld <djpig@debian.org>
Thu, 6 Dec 2007 03:56:16 +0000 (04:56 +0100)
commit50cd7649d73629aa377ebad856689c39801b8976
tree1cb32969d75dfbdd61a90522fb34e4a485c0d472
parent3a0acd9df121cd3d96c426f905ec89a536dd6fd3
parentef169716b64598385a978e17c5c8a8e1d64c8877
Merge branch 'master' into parsechangelog

Conflicts:

ChangeLog
debian/changelog
scripts/Makefile.am
ChangeLog
debian/changelog
scripts/Dpkg/ErrorHandling.pm
scripts/Makefile.am