From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:48:10 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2819^2~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70f3e4e61fc4433ca8ac4517d247df7e7af7b248;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

5213ded Refactor mml-smime.el, mml1991.el, mml2015.el
---

70f3e4e61fc4433ca8ac4517d247df7e7af7b248