]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fdd7b8 18b7191)
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Thu, 16 May 2013 20:30:09 +0000 (15:30 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 16 May 2013 20:30:09 +0000 (15:30 -0500)
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.