[libbusiness-edifact-interchange-perl] 04/04: Merge remote-tracking branch 'origin/master'

[Christopher Cormack]

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

ranginui-guest pushed a commit to branch master
in repository libbusiness-edifact-interchange-perl.

commit 82c5f97dee26b15fcc0b7c8b7d9864c5dcb597c8
Merge: 6380397 1e38340
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Jul 17 23:24:16 2014 +0000

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libbusiness-edifact-interchange-perl.git