[libdist-zilla-plugin-test-podspelling-perl] 78/86: 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.001001
in repository libdist-zilla-plugin-test-podspelling-perl.

commit 5b996d90deef41dd3e3f863dd77ef4f31cade7ee
Merge: 5251e2f 30c8476
Author: Caleb Cushing <xenoterracide at gmail.com>
Date:   Sat Oct 8 22:23:20 2011 -0500

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

 dist.ini | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --cc dist.ini
index 58ae888,82f5942..7fda4d1
--- a/dist.ini
+++ b/dist.ini
@@@ -29,8 -22,9 +29,9 @@@ Pod::Wordlist::hanekomu = 
  [NextRelease]
  	format = %-9v %{yyyy-MM-dd}d
  
+ [ReportVersions::Tiny]
  [@TestingMania]
 -	disable = NoTabsTests
 +	disable = NoTabsTests,Test::Pod::LinkCheck,SynopsisTests
  	critic_config = perlcritic.rc
  [ExtraTests]
  
@@@ -50,7 -44,8 +53,8 @@@
  
  [Git::CommitBuild]
  [Git::NextVersion]
 -	first_version = v0.1.0
 +	first_version = v2.0.0
+ 	version_regexp = ^(.+)$
  
  [CheckChangesHasContent]
  [Clean]

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