]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14867 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 13 Jun 2014 20:57:30 +0000 (20:57 +0000)
committerbors <bors@rust-lang.org>
Fri, 13 Jun 2014 20:57:30 +0000 (20:57 +0000)

Trivial merge