commit e61bde524002fda4e6fcc02fd15a86bd4cac332f Merge: 26e805d 4209272 Author: Iain Arnell <iarnell@xxxxxxxxx> Date: Sat Aug 28 12:55:22 2010 +0200 Merge branch 'master' into el6 Conflicts: .gitignore .gitignore | 3 ++- perl-File-ChangeNotify.spec | 37 ++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 29 insertions(+), 13 deletions(-) --- -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel