]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16141 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 1 Aug 2014 01:56:32 +0000 (01:56 +0000)
committerbors <bors@rust-lang.org>
Fri, 1 Aug 2014 01:56:32 +0000 (01:56 +0000)

Trivial merge