From: John Wiegley <johnw@newartisans.com>
Date: Thu, 4 Feb 2016 07:54:58 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2745
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91ab66201cedbcd2e4e8533a7152f6736ad08731;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

71b20b3 Backport: * lisp/files.el: Remove support for extra .dir-locals file
---

91ab66201cedbcd2e4e8533a7152f6736ad08731