]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14565 : fhartwig/rust/master, r=sfackler
authorbors <bors@rust-lang.org>
Sat, 31 May 2014 16:36:39 +0000 (09:36 -0700)
committerbors <bors@rust-lang.org>
Sat, 31 May 2014 16:36:39 +0000 (09:36 -0700)

Trivial merge