Merge branch 'minor'

author Paul Eggert <eggert@cs.ucla.edu>

Tue, 12 Jan 2016 20:45:39 +0000 (12:45 -0800)

committer Paul Eggert <eggert@cs.ucla.edu>

Tue, 12 Jan 2016 20:45:39 +0000 (12:45 -0800)
author Paul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jan 2016 20:45:39 +0000 (12:45 -0800)
committer Paul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jan 2016 20:45:39 +0000 (12:45 -0800)
diff --cc lib/depcomp
Simple merge
diff --cc lib/ylwrap
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Tue, 12 Jan 2016 20:45:39 +0000 (12:45 -0800)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Tue, 12 Jan 2016 20:45:39 +0000 (12:45 -0800)
		1	2
lib/depcomp	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ylwrap	patch \|	diff1 \|	diff2 \|	blob \| history