]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #17629 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 29 Sep 2014 17:18:07 +0000 (17:18 +0000)
committerbors <bors@rust-lang.org>
Mon, 29 Sep 2014 17:18:07 +0000 (17:18 +0000)

Trivial merge