Merge pull request #1621 from topecongiro/combining

author Nick Cameron <nrc@ncameron.org>

Tue, 6 Jun 2017 02:52:48 +0000 (14:52 +1200)

committer GitHub <noreply@github.com>

Tue, 6 Jun 2017 02:52:48 +0000 (14:52 +1200)
author Nick Cameron <nrc@ncameron.org>
Tue, 6 Jun 2017 02:52:48 +0000 (14:52 +1200)
committer GitHub <noreply@github.com>
Tue, 6 Jun 2017 02:52:48 +0000 (14:52 +1200)
diff --cc src/items.rs
Simple merge
diff --cc src/visitor.rs
Simple merge
author	Nick Cameron <nrc@ncameron.org>
	Tue, 6 Jun 2017 02:52:48 +0000 (14:52 +1200)
committer	GitHub <noreply@github.com>
	Tue, 6 Jun 2017 02:52:48 +0000 (14:52 +1200)
		1	2
src/items.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/visitor.rs	patch \|	diff1 \|	diff2 \|	blob \| history