From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 7 May 2011 17:47:24 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.2.1b1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ef5dfdb94e613d4f53736bc135d395587b91419;p=thirdparty%2FPython%2Fcpython.git

Merge
---

6ef5dfdb94e613d4f53736bc135d395587b91419
diff --cc Misc/NEWS
index 22a3a67560de,7fe9376ff991..c68749d92bb4
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -83,8 -83,9 +83,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 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
    detect mtime changes by comparing to the system clock instead of to the
    previous value of the mtime.