Merge pull request #136 from giuseppe/fcap-newuidmap-newgidmap

author Serge Hallyn <serge@hallyn.com>

Sat, 27 Oct 2018 16:26:31 +0000 (11:26 -0500)

committer GitHub <noreply@github.com>

Sat, 27 Oct 2018 16:26:31 +0000 (11:26 -0500)
author Serge Hallyn <serge@hallyn.com>
Sat, 27 Oct 2018 16:26:31 +0000 (11:26 -0500)
committer GitHub <noreply@github.com>
Sat, 27 Oct 2018 16:26:31 +0000 (11:26 -0500)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Sat, 27 Oct 2018 16:26:31 +0000 (11:26 -0500)
committer	GitHub <noreply@github.com>
	Sat, 27 Oct 2018 16:26:31 +0000 (11:26 -0500)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history