From: Glenn Morris <rgm@gnu.org>
Date: Tue, 1 Dec 2020 15:50:12 +0000 (-0800)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~4977
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23d206b03b20e0221ab34e32a93ee910177bcd46;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

9e0085064b Adapt Tramp versions.  Do not merge
---

23d206b03b20e0221ab34e32a93ee910177bcd46