From: Michael Foord <michael@voidspace.org.uk>
Date: Fri, 28 Sep 2012 14:19:45 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.3.1rc1~818^2^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ef1fcecc546f254e8b55d50ef82a433fc280641;p=thirdparty%2FPython%2Fcpython.git

Merge
---

8ef1fcecc546f254e8b55d50ef82a433fc280641
diff --cc Misc/NEWS
index fe0be7420300,cb1df24f5a5a..c3fc68605b19
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -36,8 -29,102 +36,10 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #16064: unittest -m claims executable is "python", not "python3"
 +
+ - Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+ 
  - Issue #15222: Insert blank line after each message in mbox mailboxes
  
  - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.