]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #4934 : nickdesaulniers/rust/issue4524cleanup, r=brson
authorbors <bors@rust-lang.org>
Thu, 14 Feb 2013 23:37:48 +0000 (15:37 -0800)
committerbors <bors@rust-lang.org>
Thu, 14 Feb 2013 23:37:48 +0000 (15:37 -0800)
review? @brson
Issue #4524

1  2 
src/libcore/hashmap.rs
src/libstd/json.rs

Simple merge
Simple merge