]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 23:18:08 +0000 (16:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2016 23:18:08 +0000 (16:18 -0700)
The following commit was skipped:

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


Trivial merge