From: Nick Gerakines <nick@gerakines.net>
Date: Tue, 23 Dec 2008 18:18:52 +0000 (-0800)
Subject: Merging svn trunk into master
X-Git-Tag: Test-NoTabs-0.4~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e84d5e471cbedca0b002e6b529e0e4857141c764;hp=-c;p=catagits%2FTest-NoTabs.git

Merging svn trunk into master
---

e84d5e471cbedca0b002e6b529e0e4857141c764
diff --combined Changes
index 079420d,2da10ee..bc07902
--- a/Changes
+++ b/Changes
@@@ -2,3 -2,10 +2,10 @@@ Revision history for Test-NoTab
  
  0.1  2006-08-24
       - Module created and released on an unsuspecting world.
+ 
+ 0.2  2006-08-25
+      - Minor code changes and pod updates
+      - Added Makefile.PL for compatibility
+ 
+ 0.3  2006-08-26
 -     - Added missing dependancy (Test::Group)
++     - Added missing dependancy (Test::Group)
diff --combined MANIFEST
index d349091,c12d52a..507b365
--- a/MANIFEST
+++ b/MANIFEST
@@@ -1,4 -1,5 +1,8 @@@
  Build.PL
++<<<<<<< HEAD:MANIFEST
++=======
+ Makefile.PL
++>>>>>>> trunk:MANIFEST
  Changes
  MANIFEST
  META.yml