From: Éric Araujo <merwok@netwok.org>
Date: Mon, 12 Sep 2011 15:34:40 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~1544
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faabef548dab1979759a67f482a06cdc3a153197;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

faabef548dab1979759a67f482a06cdc3a153197
diff --cc Misc/NEWS
index 96e9ff5020f9,3d358239e8ab..7218bfd49d95
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -274,10 -274,9 +274,14 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #12306: Expose the runtime version of the zlib C library as a constant,
 +  ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff.
 +
 +- Issue #12959: Add collections.ChainMap to collections.__all__.
++ 
+ - Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will
+   now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or
+   Download-URL field is present.
  
  - Issue #12567: Add curses.unget_wch() function. Push a character so the next
    get_wch() will return it.