summaryrefslogtreecommitdiffstats
path: root/Lib/json/__init__.py
Commit message (Expand)AuthorAgeFilesLines
* Merged revisions 88137 via svnmerge fromAntoine Pitrou2011-01-211-0/+2
* Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge fromGeorg Brandl2010-11-261-4/+20
* Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-...Georg Brandl2010-10-061-12/+10
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-88/+71
* Forward port r70471: Add object_pairs_hook. Issue 5381.Raymond Hettinger2009-04-211-5/+8
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+318