]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14932 : Sawyer47/rust/json-smallfix, r=huonw
authorbors <bors@rust-lang.org>
Mon, 16 Jun 2014 13:16:44 +0000 (13:16 +0000)
committerbors <bors@rust-lang.org>
Mon, 16 Jun 2014 13:16:44 +0000 (13:16 +0000)
1  2 
src/libserialize/json.rs

Simple merge