From: Éric Araujo <merwok@netwok.org>
Date: Mon, 5 Mar 2012 15:24:07 +0000 (+0100)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a2~276^2~16^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a59b70cbac0a35f8b520d196105974949153181;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

6a59b70cbac0a35f8b520d196105974949153181
diff --cc Misc/NEWS
index 4b18715aace8,250dd81fd9dd..e2455c80e2ca
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,26 -2,10 +2,28 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.2.3 release candidate 1?
 -===============================================
 +What's New in Python 3.3.0 Alpha 2?
 +===================================
  
 -*Release date: 24-Feb-2011*
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +Library
 +-------
 +
++- Issue #13719: Make the distutils upload command aware of bdist_msi products.
++
 +- Issue #14007: Accept incomplete TreeBuilder objects (missing start, end,
 +  data or close method) for the Python implementation as well.
 +  Drop the no-op TreeBuilder().xml() method from the C implementation.
 +
 +
 +What's New in Python 3.3.0 Alpha 1?
 +===================================
 +
 +*Release date: 05-Mar-2012*
  
  Core and Builtins
  -----------------