Merge pull request #2287 from BrandonArp/fix_am_1_11

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Thu, 18 May 2017 09:19:09 +0000 (11:19 +0200)

committer GitHub <noreply@github.com>

Thu, 18 May 2017 09:19:09 +0000 (11:19 +0200)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Thu, 18 May 2017 09:19:09 +0000 (11:19 +0200)
committer GitHub <noreply@github.com>
Thu, 18 May 2017 09:19:09 +0000 (11:19 +0200)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Thu, 18 May 2017 09:19:09 +0000 (11:19 +0200)
committer	GitHub <noreply@github.com>
	Thu, 18 May 2017 09:19:09 +0000 (11:19 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history