[libcatmandu-perl] 72/85: Merge branch 'build_failed' of https://github.com/vpeil/Catmandu into vpeil-build_failed

[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 d1cfc07c23e3e34534cf87137b181d7812f1129d
Merge: 779e503 9284bf7
Author: Patrick Hochstenbach <patrick.hochstenbach at ugent.be>
Date:   Mon May 19 09:07:10 2014 +0200

    Merge branch 'build_failed' of https://github.com/vpeil/Catmandu into vpeil-build_failed
    
    Conflicts:
    	Build.PL
    	META.json
    	README.md
    	cpanfile

 Build.PL  | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 META.json | 18 ++++++++-----
 cpanfile  | 15 +++++------
 dist.ini  |  1 +
 4 files changed, 101 insertions(+), 19 deletions(-)

diff --cc META.json
index d7f9ee2,a67bd18..6c71e0c
--- a/META.json
+++ b/META.json
@@@ -4,7 -4,7 +4,7 @@@
        "Nicolas Steenlant, C<< <nicolas.steenlant at ugent.be> >>"
     ],
     "dynamic_config" : 0,
-    "generated_by" : "Dist::Milla version v1.0.5, Dist::Zilla version 5.016, CPAN::Meta::Converter version 2.141170",
 -   "generated_by" : "Dist::Milla version v1.0.5, Dist::Zilla version 5.016, CPAN::Meta::Converter version 2.131560",
++   "generated_by" : "Dist::Milla version v1.0.5, Dist::Zilla version 5.016, CPAN::Meta::Converter version 2.132830",
     "license" : [
        "perl_5"
     ],

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