auto merge of #18141 : phildawes/rust/master, r=brson

author bors <bors@rust-lang.org>

Wed, 22 Oct 2014 07:07:09 +0000 (07:07 +0000)

committer bors <bors@rust-lang.org>

Wed, 22 Oct 2014 07:07:09 +0000 (07:07 +0000)
author bors <bors@rust-lang.org>
Wed, 22 Oct 2014 07:07:09 +0000 (07:07 +0000)
committer bors <bors@rust-lang.org>
Wed, 22 Oct 2014 07:07:09 +0000 (07:07 +0000)
diff --cc src/libsyntax/parse/mod.rs
Simple merge
diff --cc src/libsyntax/parse/parser.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 22 Oct 2014 07:07:09 +0000 (07:07 +0000)
committer	bors <bors@rust-lang.org>
	Wed, 22 Oct 2014 07:07:09 +0000 (07:07 +0000)
		1	2
src/libsyntax/parse/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsyntax/parse/parser.rs	patch \|	diff1 \|	diff2 \|	blob \| history