]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25835 - steveklabnik:gh25438, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 28 May 2015 15:29:15 +0000 (15:29 +0000)
committerbors <bors@rust-lang.org>
Thu, 28 May 2015 15:29:15 +0000 (15:29 +0000)
Fixes #25438


Trivial merge