From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sun, 23 Dec 2012 17:55:21 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~492^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=159bb53765c895abb701d20881f13468484a9dba;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

159bb53765c895abb701d20881f13468484a9dba
diff --cc Misc/NEWS
index 9a33632c7fdd,4ddcd00a8584..e7fa7d9dff5b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -179,8 -179,9 +179,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16443: Add docstrings to regular expression match objects.
+   Patch by Anton Kasyanov.
+ 
 +- Issue #15701: Fix HTTPError info method call to return the headers information.
 +
  - Issue #16646: ftplib.FTP.makeport() might lose socket error details.
    (patch by Serhiy Storchaka)