[Pkg-gnupg-commit] [gnupg2] 03/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 eae301bf9c24fd17599c005ed3415450d6dce7e3
Merge: 88d8dc8 35a3ce2
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 16 18:41:42 2016 +0200

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

 g10/tdbio.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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