Merge 3.6

author Victor Stinner <victor.stinner@gmail.com>

Fri, 6 Jan 2017 17:16:07 +0000 (18:16 +0100)

committer Victor Stinner <victor.stinner@gmail.com>

Fri, 6 Jan 2017 17:16:07 +0000 (18:16 +0100)
author Victor Stinner <victor.stinner@gmail.com>
Fri, 6 Jan 2017 17:16:07 +0000 (18:16 +0100)
committer Victor Stinner <victor.stinner@gmail.com>
Fri, 6 Jan 2017 17:16:07 +0000 (18:16 +0100)
diff --cc Lib/unittest/mock.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Fri, 6 Jan 2017 17:16:07 +0000 (18:16 +0100)
committer	Victor Stinner <victor.stinner@gmail.com>
	Fri, 6 Jan 2017 17:16:07 +0000 (18:16 +0100)
		1	2
Lib/unittest/mock.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history