merge 3.3 (#16900)

author Benjamin Peterson <benjamin@python.org>

Thu, 10 Jan 2013 20:16:42 +0000 (14:16 -0600)

committer Benjamin Peterson <benjamin@python.org>

Thu, 10 Jan 2013 20:16:42 +0000 (14:16 -0600)
author Benjamin Peterson <benjamin@python.org>
Thu, 10 Jan 2013 20:16:42 +0000 (14:16 -0600)
committer Benjamin Peterson <benjamin@python.org>
Thu, 10 Jan 2013 20:16:42 +0000 (14:16 -0600)
diff --cc Lib/ssl.py
Simple merge
diff --cc Lib/test/test_ssl.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Benjamin Peterson <benjamin@python.org>
	Thu, 10 Jan 2013 20:16:42 +0000 (14:16 -0600)
committer	Benjamin Peterson <benjamin@python.org>
	Thu, 10 Jan 2013 20:16:42 +0000 (14:16 -0600)
		1	2
Lib/ssl.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_ssl.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history