commit f383258c9463fbac45308bc4fba7a10078e55d40 Merge: 2ef91e6 4418040 Author: Steve Traylen <steve.traylen@xxxxxxx> Date: Wed May 11 00:05:47 2011 +0200 Merge branch 'master' into el6 Conflicts: .gitignore .gitignore | 4 +++- perl-Net-STOMP-Client.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 5 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