]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41331e8 419f1fa)
merge 3.4 (#21586)
authorBenjamin Peterson <benjamin@python.org>
Mon, 26 May 2014 22:11:11 +0000 (15:11 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 26 May 2014 22:11:11 +0000 (15:11 -0700)
1  2 
Doc/howto/sockets.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/howto/sockets.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.