[Python-modules-commits] [requests] 04/04: merge patched into master

[Daniele Tricoli]

This is an automated email from the git hooks/post-receive script.

eriol-guest pushed a commit to branch master
in repository requests.

commit e3d01ab4494bc5b24a939ecbb45b61f35015a7af
Merge: e89ede0 41cd0f8
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Tue Aug 1 03:10:23 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 debian/patches/01_use-system-ca-certificates.patch | 46 ----------------------
 debian/patches/series                              |  1 -
 requests/certs.py                                  |  8 ----
 setup.py                                           |  2 +-
 5 files changed, 3 insertions(+), 58 deletions(-)

diff --cc debian/.git-dpm
index 7f15dfd,0000000..f916914
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 711fa29d52f79e1513b465769154ea1f839df50c
- 711fa29d52f79e1513b465769154ea1f839df50c
++41cd0f82034673ce271c530a60f9c4b3cd85bea9
++41cd0f82034673ce271c530a60f9c4b3cd85bea9
 +41cd0f82034673ce271c530a60f9c4b3cd85bea9
 +41cd0f82034673ce271c530a60f9c4b3cd85bea9
 +requests_2.18.1.orig.tar.gz
 +8927e5bf2feb7fa43844e4972e48f9a384f7029d
 +124229
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/requests.git