Rollup merge of #48517 - penpalperson:master, r=Mark-Simulacrum

author kennytm <kennytm@gmail.com>

Sun, 25 Feb 2018 07:54:54 +0000 (15:54 +0800)

committer kennytm <kennytm@gmail.com>

Sun, 25 Feb 2018 13:30:51 +0000 (21:30 +0800)
author kennytm <kennytm@gmail.com>
Sun, 25 Feb 2018 07:54:54 +0000 (15:54 +0800)
committer kennytm <kennytm@gmail.com>
Sun, 25 Feb 2018 13:30:51 +0000 (21:30 +0800)
diff --cc src/bootstrap/builder.rs
Simple merge
diff --cc src/bootstrap/config.rs
Simple merge
author	kennytm <kennytm@gmail.com>
	Sun, 25 Feb 2018 07:54:54 +0000 (15:54 +0800)
committer	kennytm <kennytm@gmail.com>
	Sun, 25 Feb 2018 13:30:51 +0000 (21:30 +0800)
		1	2
src/bootstrap/builder.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/bootstrap/config.rs	patch \|	diff1 \|	diff2 \|	blob \| history