]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12940 : cadencemarseille/rust/time-doc, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 17 Mar 2014 01:51:52 +0000 (18:51 -0700)
committerbors <bors@rust-lang.org>
Mon, 17 Mar 2014 01:51:52 +0000 (18:51 -0700)

Trivial merge