Merge commit '32b1944d5f0a65aa10c6768f4865f7ed1de8eb49' as 'packages/pinentry'

diff --cc packages/pinentry/README
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2fb83adff10979dc86552c72c974b407310f23a8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/packages/pinentry/README
@@@ -1,0 -1,0 +1,6 @@@
++This is a staging area for further refinement of pinentry.el, until it
++gets included in Emacs proper or ELPA.
++
++See the discussion on the GnuPG mailing list:
++https://lists.gnupg.org/pipermail/gnupg-devel/2015-May/029875.html
++https://lists.gnupg.org/pipermail/gnupg-devel/2015-June/029915.html

diff --cc packages/pinentry/pinentry.el
index 0000000000000000000000000000000000000000,31156f96c133425fb1daee78b8ee8ef489c98f89..31156f96c133425fb1daee78b8ee8ef489c98f89
mode 000000,100644..100644
--- /dev/null
--- 2/pinentry.el
+++ b/packages/pinentry/pinentry.el