#17368: merge with 3.2.

author Ezio Melotti <ezio.melotti@gmail.com>

Tue, 12 Mar 2013 23:53:38 +0000 (01:53 +0200)

committer Ezio Melotti <ezio.melotti@gmail.com>

Tue, 12 Mar 2013 23:53:38 +0000 (01:53 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Tue, 12 Mar 2013 23:53:38 +0000 (01:53 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Tue, 12 Mar 2013 23:53:38 +0000 (01:53 +0200)
diff --cc Lib/json/decoder.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 12 Mar 2013 23:53:38 +0000 (01:53 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 12 Mar 2013 23:53:38 +0000 (01:53 +0200)
		1	2
Lib/json/decoder.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history