From: Kushal Das <kushaldas@gmail.com>
Date: Tue, 15 Apr 2014 19:52:52 +0000 (+0530)
Subject: Merge
X-Git-Tag: v3.5.0a1~1862
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d1f6c3b15435749002e2f08e8d88812a328c0e5;p=thirdparty%2FPython%2Fcpython.git

Merge
---

5d1f6c3b15435749002e2f08e8d88812a328c0e5
diff --cc Misc/NEWS
index 60125712abea,04410743653a..f982711a302b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -46,8 -37,8 +46,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #21203: Updated fileConfig and dictConfig to remove inconsistencies.
 +  Thanks to Jure Koren for the patch.
++  
+ - Issue #21222: Passing name keyword argument to mock.create_autospec now
+   works.
  
  - Issue #21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX.