Merge with mainline
authorMatt Zimmerman <matt.zimmerman@canonical.com>
Tue, 28 Jun 2005 18:06:22 +0000 (18:06 +0000)
committerMatt Zimmerman <matt.zimmerman@canonical.com>
Tue, 28 Jun 2005 18:06:22 +0000 (18:06 +0000)
commit4e2ded43a51b4f5522d3dd3cdfb4625a3a715966
tree3670d2d96adcc65e19d7407d31fc22acd9b04ea3
parent29ba053e05b1a496500036dbd667002d1b8b5ec2
Merge with mainline
Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-98
   Install only one keyring on each branch (Closes: #316119)
debian/changelog
debian/rules