]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30f2401 46ff4ee)
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Sat, 15 Feb 2014 21:40:08 +0000 (16:40 -0500)
committerAndrew Kuchling <amk@amk.ca>
Sat, 15 Feb 2014 21:40:08 +0000 (16:40 -0500)
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.