; Merge from origin/emacs-25

The following commit was skipped:

6102d01 ; Update ChangeLog.2 and AUTHORS files
This commit is contained in:
Paul Eggert 2017-03-19 12:29:07 -07:00
commit 2cb81869f8

Diff content is not available