From: Senthil Kumaran <senthil@uthcode.com>
Date: Mon, 14 Apr 2014 20:49:07 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.5.0a1~1876
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dc5f0af3c9c33c89f57964da7862e786db5f07b;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

7dc5f0af3c9c33c89f57964da7862e786db5f07b
diff --cc Misc/NEWS
index 2fe06ed5b60a,52cb82594ec3..37966c73542d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -37,11 -30,9 +37,11 @@@ Core and Builtin
  - Issue #12546: Allow \x00 to be used as a fill character when using str, int,
    float, and complex __format__ methods.
  
 +- Issue #20480: Add ipaddress.reverse_pointer. Patch by Leon Weber.
 +
  - Issue #13598: Modify string.Formatter to support auto-numbering of 
    replacement fields. It now matches the behavior of str.format() in
-   this regard.
+   this regard. Patches by Phil Elson and Ramchandra Apte.
  
  Library
  -------