[perl-Test-File: 4/4] Merge branch 'master' into el6

[Paul Howarth]

commit 6baf46f37671b78c0df074b1fc0fd9670c8e7910
Merge: b137afd 2a9f629
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Jul 24 13:57:01 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore          |    2 +-
 perl-Test-File.spec |  123 +++++++++++++++++++++++++++++++++++----------------
 sources             |    2 +-
 3 files changed, 86 insertions(+), 41 deletions(-)
---
diff --cc .gitignore
index 50e51d9,cd5a3b6..2b45d14
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- Test-File-1.25.tar.gz
 -Test-File-1.29.tar.gz
 -/Test-File-1.34.tar.gz
++/Test-File-[0-9.]*.tar.gz