Merge from 3.2

This commit is contained in:
Nick Coghlan 2012-04-19 22:22:37 +10:00
commit e27b3608ef
3 changed files with 5 additions and 1 deletions

View file

@ -1123,6 +1123,7 @@ Robert Xiao
Florent Xicluna
Hirokazu Yamamoto
Ka-Ping Yee
Jason Yeo
Bob Yodlowski
Danny Yoo
George Yoshida

View file

@ -121,6 +121,9 @@ Library
Tests
-----
- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging
message (Patch by Jason Yeo)
- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing
a test failure in test_ssl.