]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16092 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 30 Jul 2014 05:06:41 +0000 (05:06 +0000)
committerbors <bors@rust-lang.org>
Wed, 30 Jul 2014 05:06:41 +0000 (05:06 +0000)

Trivial merge