[perl-Try-Tiny: 7/7] Merge branch 'master' into el6

[Paul Howarth]

commit dceb20ea7afef3f61bbb46fc7a2067576335ea16
Merge: 6665e72 ae7dbd2
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Mar 26 19:22:09 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Try-Tiny.spec
    	sources

 .gitignore         |    2 +-
 perl-Try-Tiny.spec |  119 +++++++++++++++++++++++++++++++++-------------------
 sources            |    2 +-
 3 files changed, 78 insertions(+), 45 deletions(-)
---