]> granicus.if.org Git - python/commit
Merged revisions 83016 via svnmerge from
authorDoug Hellmann <doug.hellmann@gmail.com>
Wed, 21 Jul 2010 12:35:38 +0000 (12:35 +0000)
committerDoug Hellmann <doug.hellmann@gmail.com>
Wed, 21 Jul 2010 12:35:38 +0000 (12:35 +0000)
commit76e57947a10466654f09b696886eae5ff245e550
tree850b6cbcb71693b8f3e4d2c50c8228991f4ff425
parentb034c75495cf033b3ec7a1b6ea6b1f4c1338ecb4
Merged revisions 83016 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83016 | doug.hellmann | 2010-07-21 08:29:04 -0400 (Wed, 21 Jul 2010) | 1 line

  Apply patch from Ray Allen for issue 9296
........
Lib/json/tests/test_fail.py
Modules/_json.c