]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e19d9d1 a677d76)
merge 3.3 (#20251)
authorBenjamin Peterson <benjamin@python.org>
Tue, 14 Jan 2014 05:22:50 +0000 (00:22 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 14 Jan 2014 05:22:50 +0000 (00:22 -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.