merge from 3.2

This commit is contained in:
Senthil Kumaran 2011-04-13 09:37:39 +08:00
commit 00a47b8588

View file

@ -103,6 +103,9 @@ Core and Builtins
Library 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 - Issue #10019: Fixed regression in json module where an indent of 0 stopped
adding newlines and acted instead like 'None'. adding newlines and acted instead like 'None'.