[Pkg-gnupg-commit] [gnupg2] 158/160: Merge branch 'master' into STABLE-BRANCH-2-2

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

commit be1e4560d5afb99a6a7b7c639cce980006530a9e
Merge: 4ef6227 2b96661
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jul 14 15:58:56 2016 +0200

    Merge branch 'master' into STABLE-BRANCH-2-2

 agent/protect.c                              |   23 +-
 build-aux/config.guess                       |   22 +-
 build-aux/config.sub                         |   14 +-
 common/util.h                                |    9 +-
 configure.ac                                 |   11 +-
 dirmngr/ks-engine-hkp.c                      |    8 +-
 dirmngr/ks-engine-http.c                     |    3 +-
 dirmngr/server.c                             |    9 +-
 doc/gpg.texi                                 |   14 -
 g10/getkey.c                                 |   60 +-
 g10/gpg.c                                    |   28 +-
 g10/keyid.c                                  |   12 +-
 g10/keylist.c                                |  156 +-
 g10/options.h                                |    2 -
 po/ca.po                                     |   55 +-
 po/cs.po                                     |   53 +-
 po/da.po                                     |   53 +-
 po/de.po                                     |   47 +-
 po/el.po                                     |   53 +-
 po/eo.po                                     |   51 +-
 po/es.po                                     |   57 +-
 po/et.po                                     |   51 +-
 po/fi.po                                     |   51 +-
 po/fr.po                                     |   51 +-
 po/gl.po                                     |   51 +-
 po/hu.po                                     |   51 +-
 po/id.po                                     |   51 +-
 po/it.po                                     |   51 +-
 po/ja.po                                     |   51 +-
 po/nb.po                                     | 6739 +++++++++++++-------------
 po/pl.po                                     |   53 +-
 po/pt.po                                     |   51 +-
 po/ro.po                                     |   57 +-
 po/ru.po                                     |   59 +-
 po/sk.po                                     |   51 +-
 po/sv.po                                     |   53 +-
 po/tr.po                                     |   53 +-
 po/uk.po                                     |   77 +-
 po/zh_CN.po                                  |   53 +-
 po/zh_TW.po                                  |   51 +-
 tests/gpgscm/ffi.c                           |   10 +-
 tests/openpgp/samplemsgs/enc-2-keys-hh-1.asc |   20 +
 tests/openpgp/samplemsgs/enc-2-keys-hr-1.asc |   29 +
 tests/openpgp/samplemsgs/enc-2-keys-rh-1.asc |   21 +
 44 files changed, 4512 insertions(+), 4013 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git