]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #7420 : mozilla/rust/rollup, r=thestinger
authorbors <bors@rust-lang.org>
Thu, 27 Jun 2013 06:07:41 +0000 (23:07 -0700)
committerbors <bors@rust-lang.org>
Thu, 27 Jun 2013 06:07:41 +0000 (23:07 -0700)
1  2 
src/libextra/test.rs
src/librustc/middle/trans/base.rs

Simple merge
Simple merge