From: Glenn Morris <rgm@gnu.org>
Date: Fri, 22 Dec 2017 18:18:06 +0000 (-0500)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5974
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ee4f2fa8792ebaa84184f1a82219fbcd93e8103;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

8a73b70 Remove pinentry.el
---

5ee4f2fa8792ebaa84184f1a82219fbcd93e8103