From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 May 2016 17:59:29 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/9418ab39bf970dd82b5d6f2e7b40a5d8cd134a43

; Merge from origin/emacs-25

The following commit was skipped:

c760a60 tramp-sh.el: Work around a stat bug (backport from master)
---

9418ab39bf970dd82b5d6f2e7b40a5d8cd134a43