Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Sun, 13 May 2018 11:29:40 +0000 (13:29 +0200)
committerWerner Koch <wk@gnupg.org>
Sun, 13 May 2018 11:29:40 +0000 (13:29 +0200)
commit7b7576637ddfb6e426e77a86b05af6d828e585d5
tree21919eed435194f8db1dac8150b581a731a66e26
parent1793f2c46a1ae8befb4d2046c9f3da6e2c685e43
parent1ced88edf4ce7aeb13f9d962645957ba9fa0d635
Merge branch 'STABLE-BRANCH-2-2' into master

--

Resolved Conflicts:
NEWS  - removed
configure.ac - removed

Signed-off-by: Werner Koch <wk@gnupg.org>
22 files changed:
agent/command.c
common/exechelp-w32.c
common/miscellaneous.c
configure.ac
dirmngr/crlcache.c
dirmngr/dirmngr.c
dirmngr/http.c
doc/DETAILS
doc/Makefile.am
doc/gpg.texi
g10/card-util.c
g10/filter.h
g10/getkey.c
g10/gpg.c
g10/import.c
g10/keydb.h
g10/keyedit.c
g10/keylist.c
g10/mainproc.c
g10/options.h
g10/packet.h
g10/pkclist.c