]> git.saurik.com Git - apt.git/commitdiff
Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 15:01:03 +0000 (17:01 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 15:01:03 +0000 (17:01 +0200)
Conflicts:
apt-pkg/pkgcache.h
debian/changelog
methods/https.cc
methods/server.cc
test/integration/test-apt-download-progress


No differences found