]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b42128 c048d98)
#17740: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 17 Apr 2013 01:10:51 +0000 (04:10 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 17 Apr 2013 01:10:51 +0000 (04:10 +0300)
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.