]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #18186 : cakebaker/rust/fix_test_count, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 20 Oct 2014 17:57:39 +0000 (17:57 +0000)
committerbors <bors@rust-lang.org>
Mon, 20 Oct 2014 17:57:39 +0000 (17:57 +0000)
1  2 
src/doc/guide.md

Simple merge