auto merge of #12114 : brson/rust/faqs, r=cmr

author bors <bors@rust-lang.org>

Sun, 9 Feb 2014 04:01:27 +0000 (20:01 -0800)

committer bors <bors@rust-lang.org>

Sun, 9 Feb 2014 04:01:27 +0000 (20:01 -0800)
author bors <bors@rust-lang.org>
Sun, 9 Feb 2014 04:01:27 +0000 (20:01 -0800)
committer bors <bors@rust-lang.org>
Sun, 9 Feb 2014 04:01:27 +0000 (20:01 -0800)
diff --cc mk/docs.mk
Simple merge
diff --cc src/doc/index.md
Simple merge
author	bors <bors@rust-lang.org>
	Sun, 9 Feb 2014 04:01:27 +0000 (20:01 -0800)
committer	bors <bors@rust-lang.org>
	Sun, 9 Feb 2014 04:01:27 +0000 (20:01 -0800)
		1	2
mk/docs.mk	patch \|	diff1 \|	diff2 \|	blob \| history
src/doc/index.md	patch \|	diff1 \|	diff2 \|	blob \| history