; Merge from origin/emacs-25

The following commit was skipped:

07442de ; * etc/NEWS: Backport edit made on wrong branch.
This commit is contained in:
John Wiegley 2016-01-11 22:51:27 -08:00
commit f5d90b5fcf

Diff content is not available