]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 5 Mar 2015 03:50:25 +0000 (22:50 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 5 Mar 2015 03:50:25 +0000 (22:50 -0500)
1  2 
Doc/library/ssl.rst
Lib/test/test_ssl.py
Modules/_ssl.c

Simple merge
Simple merge
diff --cc Modules/_ssl.c
Simple merge