]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23844)
authorBenjamin Peterson <benjamin@python.org>
Thu, 2 Apr 2015 04:08:10 +0000 (00:08 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 2 Apr 2015 04:08:10 +0000 (00:08 -0400)
1  2 
Lib/test/test_ssl.py

Simple merge