]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16164 : anguslees/rust/rfc3999, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 2 Aug 2014 08:36:09 +0000 (08:36 +0000)
committerbors <bors@rust-lang.org>
Sat, 2 Aug 2014 08:36:09 +0000 (08:36 +0000)
Fixes #16158

1  2 
src/libtime/lib.rs

Simple merge