auto merge of #20145 : alexcrichton/rust/rollup, r=alexcrichton

author bors <bors@rust-lang.org>

Tue, 23 Dec 2014 02:41:48 +0000 (02:41 +0000)

committer bors <bors@rust-lang.org>

Tue, 23 Dec 2014 02:41:48 +0000 (02:41 +0000)
author bors <bors@rust-lang.org>
Tue, 23 Dec 2014 02:41:48 +0000 (02:41 +0000)
committer bors <bors@rust-lang.org>
Tue, 23 Dec 2014 02:41:48 +0000 (02:41 +0000)
diff --cc src/librustc_trans/trans/controlflow.rs
Simple merge
diff --cc src/librustc_trans/trans/debuginfo.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 23 Dec 2014 02:41:48 +0000 (02:41 +0000)
committer	bors <bors@rust-lang.org>
	Tue, 23 Dec 2014 02:41:48 +0000 (02:41 +0000)
		1	2
src/librustc_trans/trans/controlflow.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_trans/trans/debuginfo.rs	patch \|	diff1 \|	diff2 \|	blob \| history