commit 5acae7333fc34be97e8edffe6e04d5b54b28851b Merge: 1d97ef8 04e5088 Author: Robert Scheck <robert@xxxxxxxxxxxxxxxxx> Date: Sun Jan 2 21:51:33 2011 +0100 Merge remote branch 'origin/master' into el6 Conflicts: .gitignore .gitignore | 2 +- perl-DateTime-Format-Excel-0.2901-versioning.patch | 37 --------- perl-DateTime-Format-Excel-0.31-versioning.patch | 48 +++++++++++ perl-DateTime-Format-Excel.spec | 83 +++++++++++--------- sources | 2 +- 5 files changed, 96 insertions(+), 76 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