commit fae2b971dcac6da4d2ec3676b1f3b86e37c63b46 Merge: 19b9d53 04e5088 Author: Robert Scheck <robert@xxxxxxxxxxxxxxxxx> Date: Sun Jan 2 21:54:20 2011 +0100 Merge remote branch 'origin/master' into el4 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