]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f06afe3 d182a6c)
merge 3.2
authorMatthias Klose <doko@ubuntu.com>
Tue, 14 Aug 2012 15:30:12 +0000 (17:30 +0200)
committerMatthias Klose <doko@ubuntu.com>
Tue, 14 Aug 2012 15:30:12 +0000 (17:30 +0200)
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.