5 Commits

Author	SHA1	Message	Date
Ezio Melotti	9c18778695	#12017: merge with 3.2.	2011-05-07 18:29:14 +03:00
Ezio Melotti	06383ee090	#12017: merge with 3.1.	2011-05-07 18:15:34 +03:00
Ezio Melotti	04c6423fba	Merge with 3.1.	2011-04-13 07:18:24 +03:00
R David Murray	d5315482e9	Merge #10019: Fix regression relative to 2.6: add newlines if indent=0 ... Patch by Amaury Forgeot d'Arc, updated by Sando Tosi.	2011-04-12 21:09:18 -04:00
Alexander Belopolsky	ff27ee0b40	Issue #10572: Moved json tests to Lib/test/json_tests. ... Approved by Raymond Hettinger.	2010-11-30 03:03:30 +00:00