From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 7 May 2011 17:48:18 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0a1~2364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2407ce1a96570a82e556d6ae201f7335dff599fb;p=python

Merge
---

2407ce1a96570a82e556d6ae201f7335dff599fb
diff --cc Misc/NEWS
index 212b72cab3,a3de216ff7..f8da3b044c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -140,9 -140,8 +140,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
 +  by Kasun Herath.
 +
+ - Issue #12002: ftplib's abort() method raises TypeError.
+ 
  - Issue 11916: Add a number of MacOSX specific definitions to the errno module.
    Patch by Pierre Carrier.