]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14622 : reillywatson/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 3 Jun 2014 17:01:40 +0000 (10:01 -0700)
committerbors <bors@rust-lang.org>
Tue, 3 Jun 2014 17:01:40 +0000 (10:01 -0700)
1  2 
src/doc/intro.md

Simple merge