; Merge from origin/emacs-25

The following commit was skipped:

5213ded Refactor mml-smime.el, mml1991.el, mml2015.el
This commit is contained in:
John Wiegley 2016-01-11 22:48:10 -08:00
commit 70f3e4e61f

Diff content is not available