; Merge from origin/emacs-25

The following commit was skipped:

bb0cd31 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
This commit is contained in:
John Wiegley 2016-01-18 22:56:33 -08:00
commit 7823745acb

Diff content is not available