commit 828ccc8a3a2c51f3018f029e6943f38434778781 Merge: df4968d 59b5269 Author: Jan-Frode Myklebust <janfrode@xxxxxxxxx> Date: Thu May 19 12:26:35 2011 +0200 Merge branch 'f14' into el5 Conflicts: .gitignore perl-SOAP-Lite.spec sources .gitignore | 2 +- perl-SOAP-Lite-0.712-mod_perl.patch | 24 +++++ perl-SOAP-Lite.spec | 169 ++++++++++++++++++++++++----------- sources | 2 +- 4 files changed, 141 insertions(+), 56 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