Merge pull request #3001 from scampi/issue2977

author Nick Cameron <nrc@ncameron.org>

Tue, 18 Sep 2018 22:43:21 +0000 (10:43 +1200)

committer GitHub <noreply@github.com>

Tue, 18 Sep 2018 22:43:21 +0000 (10:43 +1200)
author Nick Cameron <nrc@ncameron.org>
Tue, 18 Sep 2018 22:43:21 +0000 (10:43 +1200)
committer GitHub <noreply@github.com>
Tue, 18 Sep 2018 22:43:21 +0000 (10:43 +1200)
diff --cc src/formatting.rs
Simple merge
diff --cc src/macros.rs
Simple merge
author	Nick Cameron <nrc@ncameron.org>
	Tue, 18 Sep 2018 22:43:21 +0000 (10:43 +1200)
committer	GitHub <noreply@github.com>
	Tue, 18 Sep 2018 22:43:21 +0000 (10:43 +1200)
		1	2
src/formatting.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/macros.rs	patch \|	diff1 \|	diff2 \|	blob \| history