]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 3 Oct 2014 22:17:30 +0000 (18:17 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 3 Oct 2014 22:17:30 +0000 (18:17 -0400)
1  2 
Lib/test/test_ssl.py

Simple merge