auto merge of #7612 : thestinger/rust/utf8, r=huonw

author bors <bors@rust-lang.org>

Mon, 8 Jul 2013 23:10:53 +0000 (16:10 -0700)

committer bors <bors@rust-lang.org>

Mon, 8 Jul 2013 23:10:53 +0000 (16:10 -0700)
author bors <bors@rust-lang.org>
Mon, 8 Jul 2013 23:10:53 +0000 (16:10 -0700)
committer bors <bors@rust-lang.org>
Mon, 8 Jul 2013 23:10:53 +0000 (16:10 -0700)
diff --cc src/libextra/json.rs
Simple merge
diff --cc src/libstd/str.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 8 Jul 2013 23:10:53 +0000 (16:10 -0700)
committer	bors <bors@rust-lang.org>
	Mon, 8 Jul 2013 23:10:53 +0000 (16:10 -0700)
		1	2
src/libextra/json.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/str.rs	patch \|	diff1 \|	diff2 \|	blob \| history