Merge remote-tracking branch 'origin/convertargs'

author David Levine <levinedl@acm.org>

Mon, 23 Feb 2015 03:21:40 +0000 (21:21 -0600)

committer David Levine <levinedl@acm.org>

Mon, 23 Feb 2015 03:21:40 +0000 (21:21 -0600)
author David Levine <levinedl@acm.org>
Mon, 23 Feb 2015 03:21:40 +0000 (21:21 -0600)
committer David Levine <levinedl@acm.org>
Mon, 23 Feb 2015 03:21:40 +0000 (21:21 -0600)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc etc/mhn.defaults.sh
Simple merge
diff --cc uip/mhbuildsbr.c
Simple merge
author	David Levine <levinedl@acm.org>
	Mon, 23 Feb 2015 03:21:40 +0000 (21:21 -0600)
committer	David Levine <levinedl@acm.org>
	Mon, 23 Feb 2015 03:21:40 +0000 (21:21 -0600)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
etc/mhn.defaults.sh	patch \|	diff1 \|	diff2 \|	blob \| history
uip/mhbuildsbr.c	patch \|	diff1 \|	diff2 \|	blob \| history