Merge pull request #793 from AndersBroman/master

author Guy Harris <[email protected]>

Thu, 10 Jan 2019 19:49:24 +0000 (11:49 -0800)

committer GitHub <[email protected]>

Thu, 10 Jan 2019 19:49:24 +0000 (11:49 -0800)
author Guy Harris <[email protected]>
Thu, 10 Jan 2019 19:49:24 +0000 (11:49 -0800)
committer GitHub <[email protected]>
Thu, 10 Jan 2019 19:49:24 +0000 (11:49 -0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc Makefile.in
Simple merge
author	Guy Harris <[email protected]>
	Thu, 10 Jan 2019 19:49:24 +0000 (11:49 -0800)
committer	GitHub <[email protected]>
	Thu, 10 Jan 2019 19:49:24 +0000 (11:49 -0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history