]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Tue, 4 Nov 2014 02:06:07 +0000 (21:06 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 4 Nov 2014 02:06:07 +0000 (21:06 -0500)
1  2 
Lib/test/test_ssl.py

Simple merge