From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 29 Jun 2022 13:34:21 +0000 (+0200)
Subject: ; Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1447^2~1381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6606c14d36bc5688a4dc5064ba327935657d657d;p=emacs.git

; Merge from origin/emacs-28

The following commit was skipped:

3d91d55432 Update Tramp version (don't merge with master)
---

6606c14d36bc5688a4dc5064ba327935657d657d