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
..
bugtracker	Lessen focus on ChangeLog files, as opposed to change log entries.	2014-11-19 11:37:56 -08:00
copyright	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
documentation	Standardize possessive apostrophe usage in manuals, docs, and comments	2012-02-28 00:17:21 -08:00
elpa	* notes/elpa: Use "git" instead of "bzr" in the name of machine to	2014-06-16 23:29:08 +02:00
font-backend	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
git-workflow	admin: Add documentation for gitmerge.el	2014-11-27 23:23:48 +01:00
hydra	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
multi-tty	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
newfile	Lessen focus on ChangeLog files, as opposed to change log entries.	2014-11-19 11:37:56 -08:00
nextstep	Fix typos.	2011-11-20 20:35:27 +01:00
repo	Improve CONTRIBUTE and related files.	2014-12-06 02:38:34 -06:00
tags	Git transition patch	2014-11-11 13:28:05 -05:00
trailing-whitespace	Nuke arch-tags.	2011-01-15 15:16:57 -08:00
unicode	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
versioning	* admin/notes/versioning: Relocate and rewrite.	2014-10-15 00:12:31 -07:00
www	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
years	Backport changes in preparation for git migration from trunk.	2014-10-31 11:03:23 +02:00