Paul Eggert 39c2fa3f4e Merge from gnulib and try to repair bad merge ... This attempts to repair problems introduced by the bad merge 5491fd1098. The easiest way for me to fix the badly-merged gnulib files was to run 'admin/merge-gnulib', so I did that, which also imported the following changes: * build-aux/update-copyright, m4/gnulib.m4: Update from gnulib, incorporating: 2015-01-15 time: port to MinGW32 3.21 2015-01-15 update-copyright: apply to self 2015-01-11 update-copyright: recognize groff's \(co marker		2015-01-27 22:24:47 -08:00
..
git-hooks	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
snippet	Merge from gnulib, incorporating:	2015-01-01 11:06:53 -08:00
dir_top	Stop keeping info/dir in the repository.	2013-12-12 00:54:21 -08:00
make-info-dir	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
move-if-change	Merge from gnulib, incorporating:	2015-01-01 11:06:53 -08:00
msys-to-w32	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
update-copyright	Merge from gnulib and try to repair bad merge	2015-01-27 22:24:47 -08:00
update-subdirs	Update copyright year to 2015	2015-01-01 14:26:41 -08:00