From: Glenn Morris <rgm@gnu.org>
Date: Mon, 31 Aug 2020 17:45:54 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~6294
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01b5617731990ead964e24ba6926d4d681192b4c;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

df5c669709 Adapt tramp-tests.el, don't merge with master
---

01b5617731990ead964e24ba6926d4d681192b4c