Paul Eggert 870c56a0bd Merge from origin/emacs-25 ... 07f45d7 ; Spelling fix 1a210f0 * admin/release-process: Update versions and blocking bug num... 36bafc9 Improve documentation of functions that accept time values # Conflicts: # admin/release-process # src/editfns.c		2016-11-19 14:43:25 -08:00
..
emacs	Merge from origin/emacs-25	2016-11-19 14:31:05 -08:00
lispintro	Fix references to long obsoleted functions/aliases	2016-11-04 12:51:04 -04:00
lispref	Merge from origin/emacs-25	2016-11-19 14:43:25 -08:00
man	* src/emacs.c (usage_message): Mention named daemon. (Bug#24949)	2016-11-15 18:21:06 -05:00
misc	Merge from origin/emacs-25	2016-11-19 14:31:05 -08:00