commit 19bda469f861fcfabf739ac25d76d288395a29d0 Merge: 722709b 8ae56a4 Author: Itamar Reis Peixoto <itamar@xxxxxxxxxxxxxxxx> Date: Sun May 15 13:41:42 2011 -0300 Merge branch 'master' into f13 Conflicts: .gitignore .gitignore | 3 +++ bucardo.spec | 5 ++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 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