commit 01c73e5ae429659c5bad9d506c76e6528a764fad Merge: 201a8f4 e825db3 Author: Nicolas Chauvet <kwizart@xxxxxxxxx> Date: Sat Dec 11 17:55:59 2010 +0100 Merge remote branch 'origin/el6/master' into el5 Conflicts: .gitignore perl-Tk-TableMatrix.spec | 96 ++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 2 files changed, 97 insertions(+), 0 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