; Merge from origin/emacs-25

The following commit was skipped:

a8a2384 ; Auto-commit of loaddefs files.
This commit is contained in:
Paul Eggert 2016-05-26 12:41:38 -07:00
commit 7ed767557e

Diff content is not available