]> git.saurik.com Git - apt.git/commit
Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid
authorMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 14:17:08 +0000 (16:17 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Fri, 22 May 2015 14:17:08 +0000 (16:17 +0200)
commit0f3150e7040f45565b459a1390606bc2f714f6a8
tree200b65a080c246b09e6bcdcd81ea82c824272600
parent314b47542c57d0a12c55dd1dd334cf233a33fcfb
parent4694e07d450baa13fa04482752ca369a5797c640
Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid

Conflicts:
apt-pkg/deb/dpkgpm.cc
apt-pkg/deb/deblistparser.cc
methods/https.cc