Merge branch 'old-maint' into maint

author Theodore Ts'o <tytso@mit.edu>

Thu, 7 Mar 2019 21:18:10 +0000 (16:18 -0500)

committer Theodore Ts'o <tytso@mit.edu>

Thu, 7 Mar 2019 21:18:10 +0000 (16:18 -0500)
author Theodore Ts'o <tytso@mit.edu>
Thu, 7 Mar 2019 21:18:10 +0000 (16:18 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Thu, 7 Mar 2019 21:18:10 +0000 (16:18 -0500)
diff --cc configure.ac
Simple merge
diff --cc lib/config.h.in
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Thu, 7 Mar 2019 21:18:10 +0000 (16:18 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 7 Mar 2019 21:18:10 +0000 (16:18 -0500)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lib/config.h.in	patch \|	diff1 \|	diff2 \|	blob \| history