From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Mon, 28 Sep 2015 02:13:28 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.6.0a1~1417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d27ed858ae9e4819884c9526b2e3bff516d9289;p=thirdparty%2FPython%2Fcpython.git

merge
---

5d27ed858ae9e4819884c9526b2e3bff516d9289
diff --cc Misc/NEWS
index 5d68a9472268,712b982f85f7..6c93caf354b2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -27,6 -27,6 +27,12 @@@ Core and Builtin
  Library
  -------
  
++- Issue #23600: Default implementation of tzinfo.fromutc() was returning
++  wrong results in some cases.
++
++- Issue #25203: Failed readline.set_completer_delims() no longer left the
++  module in inconsistent state.
++
  - Issue #25011: rlcomplete now omits private and special attribute names unless
    the prefix starts with underscores.