]> granicus.if.org Git - python/commitdiff
merge 3.4 (#24655)
authorBenjamin Peterson <benjamin@python.org>
Sat, 18 Jul 2015 18:00:00 +0000 (11:00 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 18 Jul 2015 18:00:00 +0000 (11:00 -0700)
1  2 
Modules/_ssl.c

diff --cc Modules/_ssl.c
Simple merge