From: Éric Araujo <merwok@netwok.org>
Date: Sun, 5 Feb 2012 09:48:52 +0000 (+0100)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04410c05c18a5c6af5f62a50f72488baf5312c8e;p=python

Branch merge
---

04410c05c18a5c6af5f62a50f72488baf5312c8e
diff --cc Misc/NEWS
index b553b8ad9c,41fc63ecb0..920974c53a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -466,9 -466,10 +466,13 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #13712: pysetup create should not convert package_data to extra_files.
+ 
+ - Issue #11805: package_data in setup.cfg should allow more than one value.
+ 
 +- Issue #13933: IDLE auto-complete did not work with some imported
 +  module, like hashlib.  (Patch by Roger Serwy)
 +
  - Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.
  
  - Issue #13676: Handle strings with embedded zeros correctly in sqlite3.