Merge pull request #133 from t8m/trivial

author Serge Hallyn <serge@hallyn.com>

Wed, 24 Oct 2018 03:21:12 +0000 (22:21 -0500)

committer GitHub <noreply@github.com>

Wed, 24 Oct 2018 03:21:12 +0000 (22:21 -0500)
author Serge Hallyn <serge@hallyn.com>
Wed, 24 Oct 2018 03:21:12 +0000 (22:21 -0500)
committer GitHub <noreply@github.com>
Wed, 24 Oct 2018 03:21:12 +0000 (22:21 -0500)
diff --cc lib/commonio.c
Simple merge
diff --cc src/useradd.c
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Wed, 24 Oct 2018 03:21:12 +0000 (22:21 -0500)
committer	GitHub <noreply@github.com>
	Wed, 24 Oct 2018 03:21:12 +0000 (22:21 -0500)
		1	2
lib/commonio.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/useradd.c	patch \|	diff1 \|	diff2 \|	blob \| history