[libjira-client-perl] 01/03: Resolved merge conflicts

[Angel Abad]

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

angel pushed a commit to branch master
in repository libjira-client-perl.

commit eb747d2c7bb153b515df811a0dac26d6aaddd899
Merge: 4a5262b e4d31a2
Author: Angel Abad <angelabad at gmail.com>
Date:   Sun Aug 10 10:33:40 2014 +0200

    Resolved merge conflicts
    
    Git-Dch: Ignore

 Changes                  |  6 +++++
 MANIFEST                 |  3 ++-
 META.yml                 |  6 ++---
 Makefile.PL              |  5 ++--
 README                   |  8 ++++--
 dist.ini                 |  1 -
 lib/JIRA/Client.pm       | 64 +++++++++++++++++++++++++++++++++---------------
 t/author-critic.t        | 20 ---------------
 t/release-pod-coverage.t |  1 +
 t/release-pod-syntax.t   |  1 +
 tidyall.ini              |  5 ++++
 11 files changed, 71 insertions(+), 49 deletions(-)

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