From: Robert Collins <rbtcollins@hp.com>
Date: Mon, 24 Aug 2015 00:10:23 +0000 (+1200)
Subject: Merge 2.7 heads.
X-Git-Tag: v2.7.11rc1~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d951625f8113c853981eb7af00cdbfe7b9dcaf3a;p=thirdparty%2FPython%2Fcpython.git

Merge 2.7 heads.
---

d951625f8113c853981eb7af00cdbfe7b9dcaf3a
diff --cc Misc/NEWS
index 7814de8e1fc9,b52cd2ad23dd..ebf2ed5c2645
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -34,9 -37,8 +37,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #22812: Fix unittest discovery examples.
 +  Patch from Pam McA'Nulty.
 +
+ - Issue #24634: Importing uuid should not try to load libc on Windows
+ 
  - Issue #23652: Make it possible to compile the select module against the
    libc headers from the Linux Standard Base, which do not include some
    EPOLL macros.  Initial patch by Matt Frank.
@@@ -11201,3 -11216,3 +11219,4 @@@ Ma
  ----
  
  **(For information about older versions, consult the HISTORY file.)**
++