]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19508 : cmr/rust/rollup-2014_12_03, r=cmr
authorbors <bors@rust-lang.org>
Fri, 5 Dec 2014 20:23:10 +0000 (20:23 +0000)
committerbors <bors@rust-lang.org>
Fri, 5 Dec 2014 20:23:10 +0000 (20:23 +0000)
1  2 
src/libtest/lib.rs

Simple merge