[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (NEWS)

[yury.selivanov]

https://hg.python.org/cpython/rev/b980d0ec49c0
changeset:   101805:b980d0ec49c0
parent:      101803:92048148bc49
parent:      101804:e0cd9effcb85
user:        Yury Selivanov <yury at magic.io>
date:        Wed Jun 08 13:58:35 2016 -0400
summary:
  Merge 3.5 (NEWS)

files:
  Misc/NEWS |  2 --
  1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1158,8 +1158,6 @@
 - Skip getaddrinfo if host is already resolved.
   Patch by A. Jesse Jiryu Davis.
 
-- Add asyncio.timeout() context manager.
-
 - Issue #26050: Add asyncio.StreamReader.readuntil() method.
   Patch by Марк Коренберг.
 

-- 
Repository URL: https://hg.python.org/cpython