[libconfig-model-perl] 05/05: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/libconfig-model-perl

[dod at debian.org]

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

dod pushed a commit to branch master
in repository libconfig-model-perl.

commit 9726c1b8b20f740cdd01a04fce852b405a26b16e
Merge: 661fc95 9ddb26b
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Feb 28 21:02:05 2014 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-perl/packages/libconfig-model-perl
    
    Conflicts:
    	debian/changelog

 debian/copyright | 2 +-
 debian/watch     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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