]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ffb075 97751fa)
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Mon, 3 Nov 2014 20:12:06 +0000 (15:12 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 3 Nov 2014 20:12:06 +0000 (15:12 -0500)
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.