commit 10664be510c155259bd26ad95a55dd03a9b610ba Merge: 2684891 5f60d8b Author: Iain Arnell <iarnell@xxxxxxxxx> Date: Sat Jan 8 12:51:35 2011 +0100 Merge remote branch 'origin/master' into el6 Conflicts: .gitignore .gitignore | 3 ++- auto.ini | 2 ++ perl-MooseX-Getopt.spec | 22 +++++++++++++++++----- sources | 2 +- 4 files changed, 22 insertions(+), 7 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