; Merge from origin/emacs-25

The following commit was skipped:

5b73408 Backport mm-convert-shr-links fix from master (bug#23964)
This commit is contained in:
Paul Eggert 2016-09-26 16:18:08 -07:00
commit 3db6defcf4

Diff content is not available