]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #15025 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 19 Jun 2014 01:41:43 +0000 (01:41 +0000)
committerbors <bors@rust-lang.org>
Thu, 19 Jun 2014 01:41:43 +0000 (01:41 +0000)

Trivial merge