From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 4 Oct 2016 15:23:55 +0000 (+0300)
Subject: Merge heads
X-Git-Tag: v3.6.0b2~55^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fd9f4b458dcc6416ccbc9731889a765f5df7960;p=thirdparty%2FPython%2Fcpython.git

Merge heads
---

7fd9f4b458dcc6416ccbc9731889a765f5df7960
diff --cc Misc/NEWS
index 6fa7fd4fbdaa,8371fbb39dfe..8816ea9ead91
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -10,8 +10,10 @@@ Release date: TB
  Core and Builtins
  -----------------
  
 +- Issue #28350: String constants with null character no longer interned.
 +
+ - Issue #26617: Fix crash when GC runs during weakref callbacks.
+ 
  - Issue #27942: String constants now interned recursively in tuples and frozensets.
  
  - Issue #21578: Fixed misleading error message when ImportError called with