auto merge of #16907 : SimonSapin/rust/tempdir-result, r=huonw

author bors <bors@rust-lang.org>

Sat, 6 Sep 2014 08:01:33 +0000 (08:01 +0000)

committer bors <bors@rust-lang.org>

Sat, 6 Sep 2014 08:01:33 +0000 (08:01 +0000)
author bors <bors@rust-lang.org>
Sat, 6 Sep 2014 08:01:33 +0000 (08:01 +0000)
committer bors <bors@rust-lang.org>
Sat, 6 Sep 2014 08:01:33 +0000 (08:01 +0000)
diff --cc src/librustc/back/link.rs
Simple merge
diff --cc src/librustdoc/test.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sat, 6 Sep 2014 08:01:33 +0000 (08:01 +0000)
committer	bors <bors@rust-lang.org>
	Sat, 6 Sep 2014 08:01:33 +0000 (08:01 +0000)
		1	2
src/librustc/back/link.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustdoc/test.rs	patch \|	diff1 \|	diff2 \|	blob \| history