; Merge from origin/emacs-25

The following commit was skipped:

1e5327c ; Backport ChangeLog.2 fixes from master
This commit is contained in:
Paul Eggert 2016-03-23 11:24:28 -07:00
commit 77557ce8ca

Diff content is not available