commit f308d83740ca9e3274ed93882a452250463af647 Merge: 353f86d 2d1eb60 Author: Xavier Bachelot <xavier@xxxxxxxxxxxx> Date: Mon Jul 18 20:58:50 2011 +0200 Merge branch 'master' into el6 Conflicts: .gitignore perl-HTTP-Server-Simple-Mason.spec sources .gitignore | 2 +- perl-HTTP-Server-Simple-Mason.spec | 19 +++++++++++++++++-- sources | 2 +- 3 files changed, 19 insertions(+), 4 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