; Merge from origin/emacs-25

The following commit was skipped:

372d00a ; Auto-commit of loaddefs files.
This commit is contained in:
John Wiegley 2016-01-11 22:48:09 -08:00
commit 540bfa7680

Diff content is not available