]> granicus.if.org Git - python/commitdiff
Merge 3.2 to default
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Tue, 14 Aug 2012 15:42:10 +0000 (18:42 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Tue, 14 Aug 2012 15:42:10 +0000 (18:42 +0300)
1  2 
Modules/socketmodule.c

Simple merge