Merge for #26844

author Brett Cannon <brett@python.org>

Fri, 15 Jul 2016 17:59:11 +0000 (10:59 -0700)

committer Brett Cannon <brett@python.org>

Fri, 15 Jul 2016 17:59:11 +0000 (10:59 -0700)
author Brett Cannon <brett@python.org>
Fri, 15 Jul 2016 17:59:11 +0000 (10:59 -0700)
committer Brett Cannon <brett@python.org>
Fri, 15 Jul 2016 17:59:11 +0000 (10:59 -0700)
diff --cc Lib/imp.py
Simple merge
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Brett Cannon <brett@python.org>
	Fri, 15 Jul 2016 17:59:11 +0000 (10:59 -0700)
committer	Brett Cannon <brett@python.org>
	Fri, 15 Jul 2016 17:59:11 +0000 (10:59 -0700)
		1	2
Lib/imp.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history