]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12077 : colemickens/rust/patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 7 Feb 2014 05:11:34 +0000 (21:11 -0800)
committerbors <bors@rust-lang.org>
Fri, 7 Feb 2014 05:11:34 +0000 (21:11 -0800)
1  2 
src/doc/rust.md

diff --cc src/doc/rust.md
Simple merge