]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12023 : nick29581/rust/err_res, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 5 Feb 2014 07:46:37 +0000 (23:46 -0800)
committerbors <bors@rust-lang.org>
Wed, 5 Feb 2014 07:46:37 +0000 (23:46 -0800)
closes #3512


Trivial merge