]> err.no Git - dpkg/commit
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
authorChristian Perrier <bubulle@debian.org>
Mon, 24 Sep 2007 04:06:58 +0000 (06:06 +0200)
committerChristian Perrier <bubulle@debian.org>
Mon, 24 Sep 2007 04:06:58 +0000 (06:06 +0200)
commit8d181f5203d579366a1c31a9e0290f656160c6d0
tree87cb8abcc021a9405c1b09937e355385fa699054
parent598ffd4e5f0a40b91ea75199ded4b9056a8cd399
parent482cc83e0404956b88767cde50f744e72c0e9516
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

debian/changelog
scripts/po/ChangeLog
debian/changelog
scripts/po/ChangeLog
scripts/po/fr.po