]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #10625 : huonw/rust/json-errors, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 24 Nov 2013 09:26:30 +0000 (01:26 -0800)
committerbors <bors@rust-lang.org>
Sun, 24 Nov 2013 09:26:30 +0000 (01:26 -0800)
Fixes #4244.


Trivial merge