]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 8 Apr 2015 15:11:45 +0000 (11:11 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 8 Apr 2015 15:11:45 +0000 (11:11 -0400)
1  2 
Doc/library/ssl.rst

Simple merge