]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23875)
authorBenjamin Peterson <benjamin@python.org>
Mon, 6 Apr 2015 17:06:21 +0000 (13:06 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 6 Apr 2015 17:06:21 +0000 (13:06 -0400)
1  2 
Modules/_ssl.c

diff --cc Modules/_ssl.c
Simple merge