[libdist-zilla-plugin-test-podspelling-perl] 01/02: Merge remote-tracking branch 'my/master'

[Axel Beckert]

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

abe pushed a commit to annotated tag 2.002004
in repository libdist-zilla-plugin-test-podspelling-perl.

commit 9dc78e577a5736cf9242473bd742712082fa16c0
Merge: 0b28a81 e0c647f
Author: Caleb Cushing <xenoterracide at gmail.com>
Date:   Wed Apr 4 00:18:05 2012 -0500

    Merge remote-tracking branch 'my/master'
    
    Conflicts:
    	Changes
    	dist.ini
    	lib/Dist/Zilla/Plugin/Test/PodSpelling.pm
    
    Signed-off-by: Caleb Cushing <xenoterracide at gmail.com>

 Changes                                   |  4 ++++
 dist.ini                                  |  2 +-
 lib/Dist/Zilla/Plugin/Test/PodSpelling.pm |  4 +++-
 t/attributes.t                            |  6 +++---
 t/{attributes.t => dashed.t}              | 24 +++++++++---------------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --cc Changes
index 6bed404,a29fed7..cd8a755
--- a/Changes
+++ b/Changes
@@@ -2,9 -2,10 +2,13 @@@ Revision history for Perl extension {{$
  
  {{$NEXT}}
  
 +2.002003  2012-04-04
 +	- make tests required for authors but no one else
 +
+ 2.002002  2012-03-07
+ 	- fix issue with a dash in the copyrigh holder GH #5
+ 	- use Test::Requires over eval
+ 
  2.002001  2012-01-10
  	- fix copyright year
  
diff --cc dist.ini
index de2372f,62d8c6e..9203390
--- a/dist.ini
+++ b/dist.ini
@@@ -54,7 -55,7 +54,7 @@@ Pod::Wordlist::hanekomu = 
  
  [Git::CommitBuild]
  [Git::NextVersion]
- 	first_version = 0.002000
 -	first_version = v2.0.0
++	first_version = 2
  	version_regexp = ^(.+)$
  
  [CheckChangesHasContent]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdist-zilla-plugin-test-podspelling-perl.git