; Merge from origin/emacs-25
commit3db6defcf43561deb2733446571ca1fc9f589f8f
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 23:18:08 +0000 (26 16:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 23:18:08 +0000 (26 16:18 -0700)
tree1e02fcc7d96e31aedb28ebb618b8e3f484be9c9a
parenta2513667af6c1cfc58e971b9a5476cd5edfaef1c
parent5b734087b18e4596cdf2fa34806e092c4b532db1
; Merge from origin/emacs-25

The following commit was skipped:

5b73408 Backport mm-convert-shr-links fix from master (bug#23964)