summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-04-14 18:33:14 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2014-04-14 18:33:14 (GMT)
commit327167b348630d1d01c85d77e5e08df55a6a029b (patch)
treee5ea6c9e3ff0edc3c26a425cec493130e3ee12e0
parent6283691d461ab3d378d56e9a23a1499a8ad2e655 (diff)
parent1343b25fbad990afb9287875e097853edc8032fb (diff)
downloadcpython-327167b348630d1d01c85d77e5e08df55a6a029b.zip
cpython-327167b348630d1d01c85d77e5e08df55a6a029b.tar.gz
cpython-327167b348630d1d01c85d77e5e08df55a6a029b.tar.bz2
merge 3.4
-rw-r--r--Misc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 4ab74d7..9c4f013 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,7 +42,7 @@ Core and Builtins
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.
- Issue #20968: unittest.mock.MagicMock now supports division.