commit d1920b216f06fce981b7f69ded00b3a2c3965c16 Merge: 2b41ba3 fc84043 Author: Nathanael d. Noblet <nathanael@xxxxxxx> Date: Wed Sep 22 10:31:48 2010 -0600 Merge remote branch 'origin/master' into el5/master Conflicts: dspam.spec dspam.spec | 6 +++--- 1 files changed, 3 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