[libcatmandu-perl] 69/85: Merge branch 'dev' into update_pod

[Jonas Smedegaard]

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

js pushed a commit to tag 0.91
in repository libcatmandu-perl.

commit 07cfad8f2b36256db8f240903ad136419011d93e
Merge: 14b117a 779e503
Author: Patrick Hochstenbach <patrick.hochstenbach at ugent.be>
Date:   Sun May 18 15:40:30 2014 +0200

    Merge branch 'dev' into update_pod
    
    Conflicts:
    	bin/catmandu
    	lib/Catmandu/CLI.pm

 META.json           | 1 +
 bin/catmandu        | 2 --
 cpanfile            | 1 +
 lib/Catmandu/CLI.pm | 2 +-
 t/Catmandu.t        | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)


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