]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14725 : aochagavia/rust/show, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 7 Jun 2014 22:31:44 +0000 (15:31 -0700)
committerbors <bors@rust-lang.org>
Sat, 7 Jun 2014 22:31:44 +0000 (15:31 -0700)

Trivial merge