]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14465 : Ryman/rust/patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 28 May 2014 23:01:36 +0000 (16:01 -0700)
committerbors <bors@rust-lang.org>
Wed, 28 May 2014 23:01:36 +0000 (16:01 -0700)
1  2 
src/doc/rust.md

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