Merge pull request #2913 from opensourcerouting/non-recursive-prep

author Quentin Young <qlyoung@users.noreply.github.com>

Fri, 31 Aug 2018 15:43:59 +0000 (11:43 -0400)

committer GitHub <noreply@github.com>

Fri, 31 Aug 2018 15:43:59 +0000 (11:43 -0400)
author Quentin Young <qlyoung@users.noreply.github.com>
Fri, 31 Aug 2018 15:43:59 +0000 (11:43 -0400)
committer GitHub <noreply@github.com>
Fri, 31 Aug 2018 15:43:59 +0000 (11:43 -0400)
diff --cc configure.ac
Simple merge
diff --cc lib/subdir.am
Simple merge
author	Quentin Young <qlyoung@users.noreply.github.com>
	Fri, 31 Aug 2018 15:43:59 +0000 (11:43 -0400)
committer	GitHub <noreply@github.com>
	Fri, 31 Aug 2018 15:43:59 +0000 (11:43 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lib/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history