merge 3.3 (#24094)
authorBenjamin Peterson <benjamin@python.org>
Sun, 3 May 2015 02:36:26 +0000 (22:36 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 3 May 2015 02:36:26 +0000 (22:36 -0400)
commit122f4b1bda8262ace6aa021935e8c605a17c3748
treefbe4e3303a9900d7c469786d12a8786d2f224c96
parent0a9933ebf3704540a5f31225b26acb990e1de4bf
parent501182a47b722a02edd83a344ba53d06cd9afbd1
merge 3.3 (#24094)
Misc/NEWS
Modules/_json.c