]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 304261e 7f78ddc)
#11112: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 18 Nov 2011 16:35:53 +0000 (18:35 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 18 Nov 2011 16:35:53 +0000 (18:35 +0200)
1  2 
Lib/test/test_socket.py patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_socket.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.