commit 12bc68b55cfae44b88f3b53a3c05e30418b86211 Merge: 7d7134d 5734781 Author: Robert Scheck <robert@xxxxxxxxxxxxxxxxx> Date: Tue Dec 28 01:57:31 2010 +0100 Merge remote branch 'origin/master' into el5 Conflicts: .gitignore perl-Convert-UUlib.spec sources .gitignore | 2 +- perl-Convert-UUlib.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 3 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