merge 3.4

This commit is contained in:
Senthil Kumaran 2014-04-14 14:33:14 -04:00
commit 327167b348
1 changed files with 1 additions and 1 deletions

View File

@ -42,7 +42,7 @@ Core and Builtins
Library Library
------- -------
- Issue #7776: Fix ``Host:'' header and reconnection when using - Issue #7776: Fix ``Host:`` header and reconnection when using
http.client.HTTPConnection.set_tunnel(). Patch by Nikolaus Rath. http.client.HTTPConnection.set_tunnel(). Patch by Nikolaus Rath.
- Issue #20968: unittest.mock.MagicMock now supports division. - Issue #20968: unittest.mock.MagicMock now supports division.