Auto merge of #23290 - nrc:pub_priv_mod, r=nikomatsakis

author bors <bors@rust-lang.org>

Wed, 18 Mar 2015 05:55:19 +0000 (05:55 +0000)

committer bors <bors@rust-lang.org>

Wed, 18 Mar 2015 05:55:19 +0000 (05:55 +0000)
author bors <bors@rust-lang.org>
Wed, 18 Mar 2015 05:55:19 +0000 (05:55 +0000)
committer bors <bors@rust-lang.org>
Wed, 18 Mar 2015 05:55:19 +0000 (05:55 +0000)
diff --cc src/librustc_trans/trans/common.rs
Simple merge
diff --cc src/librustc_typeck/check/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 18 Mar 2015 05:55:19 +0000 (05:55 +0000)
committer	bors <bors@rust-lang.org>
	Wed, 18 Mar 2015 05:55:19 +0000 (05:55 +0000)
		1	2
src/librustc_trans/trans/common.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc_typeck/check/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history