From: Glenn Morris <rgm@gnu.org>
Date: Wed, 29 Jul 2020 15:38:51 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~6906
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50237759b042d5f2e3df9403a4c1697c381f6eae;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

96a3b473fa Fix viewing of encrypted S/MIME messages
---

50237759b042d5f2e3df9403a4c1697c381f6eae