]> err.no Git - dpkg/commit
Merge branch 'master' into dpkg-shlibdeps-buxy
authorRaphael Hertzog <hertzog@debian.org>
Mon, 24 Sep 2007 18:54:54 +0000 (20:54 +0200)
committerRaphael Hertzog <hertzog@debian.org>
Mon, 24 Sep 2007 18:54:54 +0000 (20:54 +0200)
commitdca270df7beb27b4ee72a7e54aad7dd9268a5749
treee4d541781dd55ddbbc8166da58bc6a531f0d755f
parentd131b99fdb144d62cf93a1f3b2d75de4256d3555
parent45a49dd9c087d88378ff56666a503d3ddec00aab
Merge branch 'master' into dpkg-shlibdeps-buxy

Conflicts:

scripts/Makefile.am
scripts/Makefile.am
scripts/po/POTFILES.in