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

merge heads
---

2ff5d8103bc54f8c871e27dff9c03e112e3c307c
diff --cc Misc/NEWS
index 654a7a230e13,6f2a8c8681c9..2fe06ed5b60a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -37,8 -30,10 +37,12 @@@ 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.
+ 
  Library
  -------