]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #20733 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 8 Jan 2015 05:35:51 +0000 (05:35 +0000)
committerbors <bors@rust-lang.org>
Thu, 8 Jan 2015 05:35:51 +0000 (05:35 +0000)

Trivial merge