From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 28 Dec 2015 22:12:52 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.6.0a1~853
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3f359c71c3a51f5e115c877da7572d8042c8ad7;p=python

Merge.
---

e3f359c71c3a51f5e115c877da7572d8042c8ad7
diff --cc Misc/NEWS
index 821904fa36,4a5a71e099..7ee035504f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -123,8 -123,10 +123,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #25928: Add Decimal.as_integer_ratio().
 +
+ - Issue #25447: Copying the lru_cache() wrapper object now always works,
+   independedly from the type of the wrapped object (by returning the original
+   object unchanged).
+ 
  - Issue #25768: Have the functions in compileall return booleans instead of
    ints and add proper documentation and tests for the return values.