]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03c28fa 11cf4f6)
Issue #24357: merge from 3.4
authorNed Deily <nad@acm.org>
Tue, 2 Jun 2015 04:20:46 +0000 (21:20 -0700)
committerNed Deily <nad@acm.org>
Tue, 2 Jun 2015 04:20:46 +0000 (21:20 -0700)
1  2 
Doc/library/socket.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/socket.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.