; Merge from origin/emacs-25

The following commit was skipped:

8d0ff83 * etc/AUTHORS: Regenerate the AUTHORS file
This commit is contained in:
Paul Eggert 2016-09-26 13:32:28 -07:00
commit 2914d52129

Diff content is not available