]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #30133 - jseyfried:fix_regression, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 2 Dec 2015 17:54:30 +0000 (17:54 +0000)
committerbors <bors@rust-lang.org>
Wed, 2 Dec 2015 17:54:30 +0000 (17:54 +0000)
r? @nikomatsakis


Trivial merge