]> git.saurik.com Git - apt.git/commit
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Tue, 2 Jul 2013 06:32:34 +0000 (08:32 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 2 Jul 2013 06:32:34 +0000 (08:32 +0200)
commit8e4c3f0a42664b8c37cc2e0de285849fbf118e11
tree059b76fef1c1636a7e1ad16e5a4ce06304271718
parent25a4d2049fb79bc2c86cd45e977b4a071e5300ac
parente3c62328abbd548bb0da42fdbad954b3ce4f7102
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

Conflicts:
debian/changelog
apt-pkg/algorithms.cc
apt-pkg/depcache.cc
debian/changelog