]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #17998 : rapha/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 17 Oct 2014 00:17:25 +0000 (00:17 +0000)
committerbors <bors@rust-lang.org>
Fri, 17 Oct 2014 00:17:25 +0000 (00:17 +0000)

Trivial merge