commit 5c91b8ab534562e570b2ab8bf43c0e7f36196a28 Merge: 8140430 6734934 Author: Robin Lee <cheeselee@xxxxxxxxxxxxxxxxx> Date: Fri Jan 13 14:38:24 2012 +0800 Merge branch 'master' into el6 Conflicts: .gitignore perl-PerlIO-via-dynamic.spec | 24 +++++++++++++++++++++--- sources | 2 +- 2 files changed, 22 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