From: Glenn Morris <rgm@gnu.org>
Date: Tue, 3 Jul 2018 02:19:05 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4729
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc0e36df8d33595d6411ec4c18e3f4b643c01306;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

1f50379 Sync with Tramp 2.3.4.  Do not merge with master
---

bc0e36df8d33595d6411ec4c18e3f4b643c01306