From: Glenn Morris <rgm@gnu.org>
Date: Fri, 12 Oct 2018 17:28:40 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4305
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3856d46f53a1081085a97d0e514efe29e8529d7;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

0d2bf76 Adapt Tramp version.  Do not merge with master
---

c3856d46f53a1081085a97d0e514efe29e8529d7