]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6222d76 56692f5)
Issue #15060: merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Wed, 13 Jun 2012 21:59:21 +0000 (23:59 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Wed, 13 Jun 2012 21:59:21 +0000 (23:59 +0200)
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.