]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62d1c70 4fd929b)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 1 Apr 2015 16:37:34 +0000 (12:37 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 1 Apr 2015 16:37:34 +0000 (12:37 -0400)
1  2 
Modules/socketmodule.c patch | diff1 | diff2 | blob | history

diff --cc Modules/socketmodule.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.