]> err.no Git - dpkg/commit
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
authorChristian Perrier <bubulle@debian.org>
Sat, 8 Sep 2007 09:01:05 +0000 (11:01 +0200)
committerChristian Perrier <bubulle@debian.org>
Sat, 8 Sep 2007 09:01:05 +0000 (11:01 +0200)
commit995ba1937f883be2a45e56974d18409ba647bf5b
tree6315328153bddce3f93ae8a2686175e38c2069e1
parent099bff47424099f00cb22e9b419a37513b72510c
parent317b4f1dcc46fc145ad651c1566e39422e716d9a
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

debian/changelog
po/ChangeLog
debian/changelog
po/ChangeLog