merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back
authorDavid Kalnischkies <kalnischkies@gmail.com>
Wed, 13 Jan 2010 13:51:28 +0000 (14:51 +0100)
committerDavid Kalnischkies <kalnischkies@gmail.com>
Wed, 13 Jan 2010 13:51:28 +0000 (14:51 +0100)
commitbe4eec613e34a43f34eb9a9b227b69a58fe66ec8
treeffc2b4d427c95558bbfe8e0202724004751c5ad0
parentf45fd56b58a71f2827eb8b4f96333782d84b7b63
parent72f6c6f8d9b1a92c7795ffcfbdc3b8858eb79a70
Merge ... lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back
apt-pkg/contrib/configuration.cc
apt-pkg/deb/debindexfile.cc
debian/changelog
doc/examples/configure-index
doc/po/apt-doc.pot
doc/po/es.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt_BR.po