From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 13 Apr 2011 01:34:21 +0000 (+0800)
Subject: merge update
X-Git-Tag: v3.2.1b1~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af87886d8dd0cab6f06b4721540f2a64f36676b6;p=thirdparty%2FPython%2Fcpython.git

merge update
---

af87886d8dd0cab6f06b4721540f2a64f36676b6
diff --cc Misc/NEWS
index 300e46dd4932,af3ad9ac9a61..7dd4c409a5ad
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -53,8 -53,8 +53,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #11703 - urllib2.geturl() does not return correct url when the original
 +  url contains #fragment.
++  
+ - Issue #10019: Fixed regression in json module where an indent of 0 stopped
+   adding newlines and acted instead like 'None'.
  
  - Issue #5162: Treat services like frozen executables to allow child spawning
    from multiprocessing.forking on Windows.