#11468: merge with 3.4.

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

Tue, 24 Mar 2015 10:52:13 +0000 (12:52 +0200)

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

Tue, 24 Mar 2015 10:52:13 +0000 (12:52 +0200)
author Ezio Melotti <ezio.melotti@gmail.com>
Tue, 24 Mar 2015 10:52:13 +0000 (12:52 +0200)
committer Ezio Melotti <ezio.melotti@gmail.com>
Tue, 24 Mar 2015 10:52:13 +0000 (12:52 +0200)
diff --cc Doc/library/unittest.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 24 Mar 2015 10:52:13 +0000 (12:52 +0200)
committer	Ezio Melotti <ezio.melotti@gmail.com>
	Tue, 24 Mar 2015 10:52:13 +0000 (12:52 +0200)
		1	2
Doc/library/unittest.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history