[libgnupg-interface-perl] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/libgnupg-interface-perl

[David Bremner]

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

bremner pushed a commit to branch master
in repository libgnupg-interface-perl.

commit 6fab30423f8e13bcfb82e20c12e25d190dfa7b38
Merge: 4a1e828 da61104
Author: David Bremner <david at tethera.net>
Date:   Thu Aug 28 17:19:31 2014 -0700

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/libgnupg-interface-perl
    
    Conflicts:
    	debian/tests/control
    	debian/tests/regression
    
    Keep David's changes.

 debian/changelog | 17 +++++++++++++++++
 debian/control   |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgnupg-interface-perl.git