]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sat, 6 Dec 2014 16:37:18 +0000 (11:37 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 6 Dec 2014 16:37:18 +0000 (11:37 -0500)
1  2 
Doc/library/ssl.rst

Simple merge