[libstring-scanf-perl] 03/03: Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libstring-scanf-perl

[Sam James]

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

sam_c-guest pushed a commit to branch master
in repository libstring-scanf-perl.

commit 241de53dfa541f347f361ac3349d0708b5e7c245
Merge: b0c69e5 cec42b8
Author: sam james <sam at cmpct.info>
Date:   Mon Aug 22 15:56:50 2016 +0000

    Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libstring-scanf-perl
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright


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