From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:53:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2383
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4df043c55892b20418c763df48e313f1c44f442e;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

7c1e6eb Allow binding `url-mime-accept-string'
---

4df043c55892b20418c763df48e313f1c44f442e