projects
/
python
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30f2401
46ff4ee
)
Merge from 3.3
author
Andrew Kuchling
<amk@amk.ca>
Sat, 15 Feb 2014 21:40:08 +0000
(16:40 -0500)
committer
Andrew 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