From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 9 May 2022 04:30:28 +0000 (+0200)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1910^2~888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a215357255004f2757d8d20dc0ecc61d29d93dc;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

e683b08b3f Handle changed scp protocol in Tramp, don't merge
---

1a215357255004f2757d8d20dc0ecc61d29d93dc