[libdist-zilla-plugin-test-podspelling-perl] 58/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 3ef38b052e2773c7b37c74ec26f3c4a1fbefaa08
Merge: 8e948d7 f22c663
Author: Caleb Cushing <xenoterracide at gmail.com>
Date:   Sat Aug 6 12:45:18 2011 -0500

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

 .gitignore | 14 ++++++++++++++
 dist.ini   | 11 +++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --cc .gitignore
index 9f3674c,c60370b..d77109d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,16 +1,17 @@@
 +Dist-Zilla-Plugin-PodSpellingTests-*
  .build
  *.swp
+ *.bak
+ *~
+ *.old
+ Makefile
+ blib/
+ pm_to_blib
+ Build
+ _build
+ cover_db/
+ nytprof*
+ *.patch
+ .DS_Store
+ MYMETA.*
+ *.o
diff --cc dist.ini
index 807db01,c175fdd..deddb8a
--- a/dist.ini
+++ b/dist.ini
@@@ -6,13 -3,6 +6,10 @@@ license = Artistic_2_
  copyright_holder = Caleb Cushing
  copyright_year   = 2011
  
 +[Prereqs]
 +Test::Spelling = 0
 +Pod::Wordlist::hanekomu = 0
 +
- [MetaResources]
- 	repository.type = git
- 
  [ReadmeFromPod]
  [@Filter]
  	-bundle = @Basic

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