commit 54f4c257f89a60bc8ba348859a7850c81951aee4 Merge: d816f68 c609c70 Author: Iain Arnell <iarnell@xxxxxxxxx> Date: Fri Dec 17 06:32:50 2010 +0100 Merge branch 'master' into f13 Conflicts: .gitignore .gitignore | 1 + perl-POE-Filter-IRCD.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 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