]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96d8368 2b07b0e)
merge with 3.4
authorGeorg Brandl <georg@python.org>
Tue, 28 Oct 2014 21:45:36 +0000 (22:45 +0100)
committerGeorg Brandl <georg@python.org>
Tue, 28 Oct 2014 21:45:36 +0000 (22:45 +0100)
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.