[Pkg-gnupg-commit] [gnupg2] 03/03: Merge branch 'experimental' of ssh://git.debian.org/git/pkg-gnupg/gnupg2 into experimental

[Eric Dorland]

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

eric pushed a commit to branch experimental
in repository gnupg2.

commit fd58f214c526f62198c6dcc26452f316a141e046
Merge: dfd66c1 e623348
Author: Eric Dorland <eric at debian.org>
Date:   Tue Jun 30 17:34:08 2015 -0400

    Merge branch 'experimental' of ssh://git.debian.org/git/pkg-gnupg/gnupg2 into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/series


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