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

Merge updates
---

a8b0f9adfeac1aa5bb8189c46a9cc7d01f89d8a5
diff --cc Misc/NEWS
index a36abac59502,af8fb292c83c..021bcf15c2ba
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -51,8 -51,8 +51,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.