]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82fa90c a40e6b0)
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 13 Jun 2014 19:21:01 +0000 (15:21 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 13 Jun 2014 19:21:01 +0000 (15:21 -0400)
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.