; Merge from origin/emacs-25

The following commit was skipped:

4606529 ; ChangeLog.2 update
This commit is contained in:
Paul Eggert 2016-12-07 12:39:08 -08:00
commit 32b46fc82f

Diff content is not available