commit 1131f83619ec55ac6d852b53b62c45241bb5faeb Merge: 3192320 ccbe95d Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Fri Jan 7 16:06:35 2011 +0000 Merge remote branch 'remotes/origin/master' into el6/master Conflicts: .gitignore perl-Package-Stash.spec sources .gitignore | 2 +- Package-Stash-0.08-old-Test::More.patch | 131 --------- Package-Stash-0.20-no-Test::Requires.patch | 48 ++++ ...atch => Package-Stash-0.22-EU::MM-version.patch | 30 +- Package-Stash-0.22-old-Test::More.patch | 294 ++++++++++++++++++++ perl-Package-Stash.spec | 65 ++++- sources | 2 +- 7 files changed, 419 insertions(+), 153 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