summaryrefslogtreecommitdiffstats
path: root/Lib/json/__init__.py
Commit message (Expand)AuthorAgeFilesLines
* 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