auto merge of #15610 : brson/rust/0.12.0, r=alexcrichton

author bors <bors@rust-lang.org>

Sat, 12 Jul 2014 18:06:36 +0000 (18:06 +0000)

committer bors <bors@rust-lang.org>

Sat, 12 Jul 2014 18:06:36 +0000 (18:06 +0000)
author bors <bors@rust-lang.org>
Sat, 12 Jul 2014 18:06:36 +0000 (18:06 +0000)
committer bors <bors@rust-lang.org>
Sat, 12 Jul 2014 18:06:36 +0000 (18:06 +0000)
diff --cc man/rustc.1
Simple merge
diff --cc src/libgreen/lib.rs
Simple merge
diff --cc src/libstd/lib.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sat, 12 Jul 2014 18:06:36 +0000 (18:06 +0000)
committer	bors <bors@rust-lang.org>
	Sat, 12 Jul 2014 18:06:36 +0000 (18:06 +0000)
		1	2
man/rustc.1	patch \|	diff1 \|	diff2 \|	blob \| history
src/libgreen/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history