]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #26323 - steveklabnik:gh26320, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 16 Jun 2015 10:40:33 +0000 (10:40 +0000)
committerbors <bors@rust-lang.org>
Tue, 16 Jun 2015 10:40:33 +0000 (10:40 +0000)
Fixes #26320


Trivial merge