]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87f6c22 6150804)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 26 Nov 2014 00:05:40 +0000 (18:05 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 26 Nov 2014 00:05:40 +0000 (18:05 -0600)
1  2 
Lib/test/test_httplib.py patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_httplib.py
Simple merge
Mirror of https://github.com/python/cpython.git