#16681: merge with 3.2.

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

Fri, 14 Dec 2012 18:13:39 +0000 (20:13 +0200)

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

Fri, 14 Dec 2012 18:13:39 +0000 (20:13 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Fri, 14 Dec 2012 18:13:39 +0000 (20:13 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Fri, 14 Dec 2012 18:13:39 +0000 (20:13 +0200)
diff --cc Doc/library/unicodedata.rst
Simple merge
diff --cc Modules/unicodedata.c
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 14 Dec 2012 18:13:39 +0000 (20:13 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Fri, 14 Dec 2012 18:13:39 +0000 (20:13 +0200)
		1	2
Doc/library/unicodedata.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Modules/unicodedata.c	patch \|	diff1 \|	diff2 \|	blob \| history