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
..
emacs	Merge from origin/emacs-24	2015-01-28 01:08:18 -03:00
lispintro	Fix copyright years by hand	2015-01-01 14:27:34 -08:00
lispref	Merge from origin/emacs-24	2015-01-28 01:08:18 -03:00
man	Merge from gnulib and try to repair bad merge	2015-01-27 22:24:47 -08:00
misc	Merge from origin/emacs-24	2015-01-28 00:09:39 -03:00