From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 24 Oct 2011 11:17:27 +0000 (+0200)
Subject: Merge 3.2.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a985c3549a8febb934e041601bb1dd20352bb53;p=python

Merge 3.2.
---

6a985c3549a8febb934e041601bb1dd20352bb53
diff --cc Misc/NEWS
index 2ab804770a,3909420e12..ebc72b4d26
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -338,10 -58,8 +338,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #13255: wrong docstrings in array module.
+ 
 +- Issue #8540: Remove deprecated Context._clamp attribute in Decimal module.
 +
 +- Issue #13235: Added PendingDeprecationWarning to warn() method and function.
 +
  - Issue #9168: now smtpd is able to bind privileged port.
  
  - Issue #12529: fix cgi.parse_header issue on strings with double-quotes and