[perl-App-Nopaste/f13/master: 10/10] Merge branch 'master' into f13

[Iain Arnell]

commit 7602d4bd2852b39cb864b6a49f6b4a790c325ebc
Merge: 9a5cc63 c91805a
Author: Iain Arnell <iarnell at gmail.com>
Date:   Sun Jan 2 13:33:50 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore            |    4 +++-
 perl-App-Nopaste.spec |   41 ++++++++++++++++++++++++++++++-----------
 sources               |    2 +-
 3 files changed, 34 insertions(+), 13 deletions(-)
---