]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16895 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 31 Aug 2014 08:26:30 +0000 (08:26 +0000)
committerbors <bors@rust-lang.org>
Sun, 31 Aug 2014 08:26:30 +0000 (08:26 +0000)
Let's try this again!


Trivial merge