commit 60e9f9d5a448a4799c6f924c3ec08e32947c61d3 Merge: 0349feb 69a39b9 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Fri Dec 17 16:56:31 2010 +0000 Merge remote branch 'origin/master' into f13/master Conflicts: .gitignore perl-IO-Socket-SSL.spec sources .gitignore | 2 +- perl-IO-Socket-SSL.spec | 29 ++++++++++++++++++++++++++++- sources | 2 +- 3 files changed, 30 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