[libdist-zilla-plugin-test-podspelling-perl] 06/11: Merge remote-tracking branch 'dzil-base/master'

[Axel Beckert]

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

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

commit 7d946354d656b7bad4290dcd8df5f060e3b748b7
Merge: 6929664 f27bd05
Author: Caleb Cushing <xenoterracide at gmail.com>
Date:   Tue Apr 3 23:51:48 2012 -0500

    Merge remote-tracking branch 'dzil-base/master'
    
    Conflicts:
    	dist.ini
    
    Signed-off-by: Caleb Cushing <xenoterracide at gmail.com>

 dist.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --cc dist.ini
index 62d8c6e,0a16dc2..de2372f
--- a/dist.ini
+++ b/dist.ini
@@@ -31,12 -21,10 +31,11 @@@ Pod::Wordlist::hanekomu = 
  [NextRelease]
  	format = %-9v %{yyyy-MM-dd}d
  
 -[ReportVersions::Tiny]
 +[ReportVersions]
 +
  [@TestingMania]
 -	disable = NoTabsTests
 +	disable = NoTabsTests,Test::Pod::LinkCheck,Test::Synopsis
  	critic_config = perlcritic.rc
- [ExtraTests]
  
  [Test::PodSpelling]
      stopwords = SubmittingPatches
@@@ -55,7 -42,7 +54,7 @@@
  
  [Git::CommitBuild]
  [Git::NextVersion]
- 	first_version = v2.0.0
 -	first_version = 0.001000
++	first_version = 0.002000
  	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