]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14765 : rapha/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 9 Jun 2014 04:26:59 +0000 (21:26 -0700)
committerbors <bors@rust-lang.org>
Mon, 9 Jun 2014 04:26:59 +0000 (21:26 -0700)

Trivial merge