]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23679)
authorBenjamin Peterson <benjamin@python.org>
Mon, 16 Mar 2015 17:45:27 +0000 (12:45 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 16 Mar 2015 17:45:27 +0000 (12:45 -0500)
1  2 
Doc/library/ssl.rst

Simple merge