; Merge from origin/emacs-25

The following commit was skipped:

50b4f85720 ; Bump Emacs version past 25.2
This commit is contained in:
Glenn Morris 2017-06-11 16:20:40 -07:00
commit 30963b4ef9

Diff content is not available