merged from the debian-wheezy branch
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 8 May 2013 15:48:31 +0000 (17:48 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 8 May 2013 15:48:31 +0000 (17:48 +0200)
commit597341fe0f0a87c3888a62ce02631db8b25aeb4b
tree6565f0a8cca0cd8fe7be4bb4149edfbfb62c7ce2
parentb5595da902e62af7c295f1603ae5b43ba4cef281
parentdec5b117052b77e4366efd8234e0cec09989b700
merged from the debian-wheezy branch
apt-pkg/algorithms.cc
debian/changelog
debian/control
methods/https.cc