; Merge from origin/emacs-25

The following commits were skipped:

c491989 Port to Sun C 5.14
95eb641 Fix mail-combine-fields
This commit is contained in:
Paul Eggert
2016-12-07 12:41:05 -08:00

Diff Content Not Available