Rollup merge of #42006 - jseyfried:fix_include_regression, r=nrc

author Mark Simulacrum <mark.simulacrum@gmail.com>

Fri, 19 May 2017 20:16:15 +0000 (14:16 -0600)

committer GitHub <noreply@github.com>

Fri, 19 May 2017 20:16:15 +0000 (14:16 -0600)
author Mark Simulacrum <mark.simulacrum@gmail.com>
Fri, 19 May 2017 20:16:15 +0000 (14:16 -0600)
committer GitHub <noreply@github.com>
Fri, 19 May 2017 20:16:15 +0000 (14:16 -0600)
diff --cc src/libsyntax/ext/base.rs
Simple merge
diff --cc src/libsyntax/ext/source_util.rs
Simple merge
author	Mark Simulacrum <mark.simulacrum@gmail.com>
	Fri, 19 May 2017 20:16:15 +0000 (14:16 -0600)
committer	GitHub <noreply@github.com>
	Fri, 19 May 2017 20:16:15 +0000 (14:16 -0600)
		1	2
src/libsyntax/ext/base.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsyntax/ext/source_util.rs	patch \|	diff1 \|	diff2 \|	blob \| history