; Merge from origin/emacs-26

The following commit was skipped:

8a73b70 Remove pinentry.el
This commit is contained in:
Glenn Morris 2017-12-22 13:18:06 -05:00
commit 5ee4f2fa87

Diff content is not available