diff options
| author | Donald Stufft <donald@stufft.io> | 2014-05-03 01:13:28 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-05-03 01:13:28 -0400 |
| commit | 0e72f65bf4e5ea6b8fd17d02fe4cae0ba7da5113 (patch) | |
| tree | 5c04afcabe3c7087e38b8114b19de437f2cf4ab3 /pip/_vendor/requests/packages/urllib3/contrib/pyopenssl.py | |
| parent | bdef6cebfb4e92a388cf84ed55cbd4ead8ef269c (diff) | |
| parent | 93098d0c6781dd7019dfa43d9030f14b28f1bf2d (diff) | |
| download | pip-0e72f65bf4e5ea6b8fd17d02fe4cae0ba7da5113.tar.gz | |
Merge branch '1.5.X'1.5.5
Conflicts:
.travis/py34.sh
CHANGES.txt
PROJECT.txt
Diffstat (limited to 'pip/_vendor/requests/packages/urllib3/contrib/pyopenssl.py')
0 files changed, 0 insertions, 0 deletions