[perl-Test-FailWarnings: 2/2] Merge branch 'master' into epel7

[Paul Howarth]

commit 31bca042d3ea6248002982ef3c5103f3e106753a
Merge: 0fe0cdf bf8065c
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Jan 23 13:16:22 2014 +0000

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	perl-Test-FailWarnings.spec
    	sources

 .gitignore                  |    4 ++++
 perl-Test-FailWarnings.spec |   22 ++++++++++++++++++++--
 sources                     |    2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)
---