auto merge of #13557 : FlaPer87/rust/ls-behind-z, r=brson

author bors <bors@rust-lang.org>

Thu, 17 Apr 2014 08:31:27 +0000 (01:31 -0700)

committer bors <bors@rust-lang.org>

Thu, 17 Apr 2014 08:31:27 +0000 (01:31 -0700)
author bors <bors@rust-lang.org>
Thu, 17 Apr 2014 08:31:27 +0000 (01:31 -0700)
committer bors <bors@rust-lang.org>
Thu, 17 Apr 2014 08:31:27 +0000 (01:31 -0700)
diff --cc man/rustc.1
Simple merge
diff --cc src/librustc/driver/driver.rs
Simple merge
diff --cc src/librustc/driver/session.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 17 Apr 2014 08:31:27 +0000 (01:31 -0700)
committer	bors <bors@rust-lang.org>
	Thu, 17 Apr 2014 08:31:27 +0000 (01:31 -0700)
		1	2
man/rustc.1	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/driver/driver.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/driver/session.rs	patch \|	diff1 \|	diff2 \|	blob \| history