]> 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: 842e567 4c1aebd)
#5421: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 7 May 2011 16:51:47 +0000 (19:51 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 7 May 2011 16:51:47 +0000 (19:51 +0300)
1  2 
Lib/test/test_socket.py patch | diff1 | diff2 | blob | history

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