commit 138515e7b9450d69dd2abd206e0f1f490780b67b Merge: 62eac32 5ddec6e Author: Paul Howarth <p...@city-fan.org> Date: Mon Feb 21 16:15:53 2011 +0000
Merge branch 'master' into el6 Conflicts: .gitignore perl-IO-Multiplex.spec .gitignore | 2 +- perl-IO-Multiplex.spec | 44 ++++++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 36 insertions(+), 12 deletions(-) --- -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/perl-devel