Merge pull request #4 from xnox/master

author Serge Hallyn <serge@hallyn.com>

Fri, 13 Nov 2015 05:07:29 +0000 (23:07 -0600)

committer Serge Hallyn <serge@hallyn.com>

Fri, 13 Nov 2015 05:07:29 +0000 (23:07 -0600)
author Serge Hallyn <serge@hallyn.com>
Fri, 13 Nov 2015 05:07:29 +0000 (23:07 -0600)
committer Serge Hallyn <serge@hallyn.com>
Fri, 13 Nov 2015 05:07:29 +0000 (23:07 -0600)
diff --cc lib/commonio.c
Simple merge
diff --cc src/groupdel.c
Simple merge
diff --cc src/usermod.c
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Fri, 13 Nov 2015 05:07:29 +0000 (23:07 -0600)
committer	Serge Hallyn <serge@hallyn.com>
	Fri, 13 Nov 2015 05:07:29 +0000 (23:07 -0600)
		1	2
lib/commonio.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/groupdel.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/usermod.c	patch \|	diff1 \|	diff2 \|	blob \| history