merge 3.3 (#20896)
authorBenjamin Peterson <benjamin@python.org>
Wed, 12 Mar 2014 23:10:57 +0000 (18:10 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 12 Mar 2014 23:10:57 +0000 (18:10 -0500)
1  2 
Lib/test/test_ssl.py

Simple merge