Auto merge of #46196 - projektir:rbe-submodule, r=steveklabnik

author bors <bors@rust-lang.org>

Mon, 15 Jan 2018 02:02:22 +0000 (02:02 +0000)

committer bors <bors@rust-lang.org>

Mon, 15 Jan 2018 02:02:22 +0000 (02:02 +0000)
author bors <bors@rust-lang.org>
Mon, 15 Jan 2018 02:02:22 +0000 (02:02 +0000)
committer bors <bors@rust-lang.org>
Mon, 15 Jan 2018 02:02:22 +0000 (02:02 +0000)
diff --cc src/bootstrap/builder.rs
Simple merge
diff --cc src/bootstrap/doc.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 15 Jan 2018 02:02:22 +0000 (02:02 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 15 Jan 2018 02:02:22 +0000 (02:02 +0000)
		1	2
src/bootstrap/builder.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/bootstrap/doc.rs	patch \|	diff1 \|	diff2 \|	blob \| history