From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 25 Sep 2017 18:16:05 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6294
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0bd61c212fe53fb843a10da9a2da88e110d3785a;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

3003ac0469 Adapt Tramp version.  Do not merge
---

0bd61c212fe53fb843a10da9a2da88e110d3785a