]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25882 - steveklabnik:gh25554, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 30 May 2015 21:10:07 +0000 (21:10 +0000)
committerbors <bors@rust-lang.org>
Sat, 30 May 2015 21:10:07 +0000 (21:10 +0000)
Fixes #25554


Trivial merge