]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 901acb4 bd1d12e)
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Tue, 14 Jan 2014 05:29:03 +0000 (00:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 14 Jan 2014 05:29:03 +0000 (00:29 -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.