From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Sep 2016 23:18:08 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1540
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3db6defcf43561deb2733446571ca1fc9f589f8f;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

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

3db6defcf43561deb2733446571ca1fc9f589f8f