Merge 3.5: issue #26801

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

Tue, 19 Apr 2016 20:29:11 +0000 (22:29 +0200)

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

Tue, 19 Apr 2016 20:29:11 +0000 (22:29 +0200)
author Victor Stinner <victor.stinner@gmail.com>
Tue, 19 Apr 2016 20:29:11 +0000 (22:29 +0200)
committer Victor Stinner <victor.stinner@gmail.com>
Tue, 19 Apr 2016 20:29:11 +0000 (22:29 +0200)
diff --cc Lib/shutil.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Victor Stinner <victor.stinner@gmail.com>
	Tue, 19 Apr 2016 20:29:11 +0000 (22:29 +0200)
committer	Victor Stinner <victor.stinner@gmail.com>
	Tue, 19 Apr 2016 20:29:11 +0000 (22:29 +0200)
		1	2
Lib/shutil.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history