]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #13248 : tedhorst/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 2 Apr 2014 15:16:42 +0000 (08:16 -0700)
committerbors <bors@rust-lang.org>
Wed, 2 Apr 2014 15:16:42 +0000 (08:16 -0700)

Trivial merge