]> err.no Git - dpkg/commit
Merge commit 'origin/master' into sourcev3
authorFrank Lichtenheld <djpig@debian.org>
Sun, 17 Feb 2008 20:38:51 +0000 (21:38 +0100)
committerFrank Lichtenheld <djpig@debian.org>
Sun, 17 Feb 2008 20:38:51 +0000 (21:38 +0100)
commitbface9592c455e3a7bb11c882d74501e2873f4dd
tree648244a032cbf1aefa740be0b1e917a94f2c98b2
parent831b0efc92873d740ca9fb9bc0eaa9eb0377df5f
parent175f25fe2cef441f0e33bf44f5097954cb3d5153
Merge commit 'origin/master' into sourcev3

Conflicts:

scripts/dpkg-source.pl
debian/dpkg-dev.install
scripts/Makefile.am
scripts/dpkg-source.pl
scripts/po/POTFILES.in