]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #22796 - Manishearth:rollup, r=Manishearth
authorbors <bors@rust-lang.org>
Wed, 25 Feb 2015 20:32:58 +0000 (20:32 +0000)
committerbors <bors@rust-lang.org>
Wed, 25 Feb 2015 20:32:58 +0000 (20:32 +0000)
1  2 
src/librustc/session/mod.rs

Simple merge