Auto merge of #23219 - Manishearth:rollup, r=Manishearth

author bors <bors@rust-lang.org>

Mon, 9 Mar 2015 16:02:29 +0000 (16:02 +0000)

committer bors <bors@rust-lang.org>

Mon, 9 Mar 2015 16:02:29 +0000 (16:02 +0000)
author bors <bors@rust-lang.org>
Mon, 9 Mar 2015 16:02:29 +0000 (16:02 +0000)
committer bors <bors@rust-lang.org>
Mon, 9 Mar 2015 16:02:29 +0000 (16:02 +0000)
diff --cc src/doc/reference.md
Simple merge
diff --cc src/libcore/marker.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 9 Mar 2015 16:02:29 +0000 (16:02 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 9 Mar 2015 16:02:29 +0000 (16:02 +0000)
		1	2
src/doc/reference.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/libcore/marker.rs	patch \|	diff1 \|	diff2 \|	blob \| history