]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #17142 : sfackler/rust/issue-17115, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 11 Sep 2014 02:35:38 +0000 (02:35 +0000)
committerbors <bors@rust-lang.org>
Thu, 11 Sep 2014 02:35:38 +0000 (02:35 +0000)
Closes #17115


Trivial merge