Auto merge of #22497 - nikomatsakis:suffixes, r=alexcrichton

author bors <bors@rust-lang.org>

Thu, 19 Feb 2015 07:59:27 +0000 (07:59 +0000)

committer bors <bors@rust-lang.org>

Thu, 19 Feb 2015 07:59:27 +0000 (07:59 +0000)
author bors <bors@rust-lang.org>
Thu, 19 Feb 2015 07:59:27 +0000 (07:59 +0000)
committer bors <bors@rust-lang.org>
Thu, 19 Feb 2015 07:59:27 +0000 (07:59 +0000)
diff --cc src/librustc_trans/trans/common.rs
Simple merge
diff --cc src/librustc_trans/trans/expr.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 19 Feb 2015 07:59:27 +0000 (07:59 +0000)
committer	bors <bors@rust-lang.org>
	Thu, 19 Feb 2015 07:59:27 +0000 (07:59 +0000)
		1	2
src/librustc_trans/trans/common.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_trans/trans/expr.rs	patch \|	diff1 \|	diff2 \|	blob \| history