Auto merge of #27860 - m4rw3r:rustdoc_unstable_feature_issue, r=alexcrichton

author bors <bors@rust-lang.org>

Sat, 22 Aug 2015 08:16:53 +0000 (08:16 +0000)

committer bors <bors@rust-lang.org>

Sat, 22 Aug 2015 08:16:53 +0000 (08:16 +0000)
author bors <bors@rust-lang.org>
Sat, 22 Aug 2015 08:16:53 +0000 (08:16 +0000)
committer bors <bors@rust-lang.org>
Sat, 22 Aug 2015 08:16:53 +0000 (08:16 +0000)
diff --cc src/libcore/lib.rs
Simple merge
diff --cc src/libstd/lib.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sat, 22 Aug 2015 08:16:53 +0000 (08:16 +0000)
committer	bors <bors@rust-lang.org>
	Sat, 22 Aug 2015 08:16:53 +0000 (08:16 +0000)
		1	2
src/libcore/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history