commit 722709b234db2e44cdf826b350deab6982c264ba Merge: 92319fb 5791b43 Author: Itamar Reis Peixoto <itamar@xxxxxxxxxxxxxxxx> Date: Fri Apr 22 19:50:39 2011 -0300 Merge branch 'master' into f13 Conflicts: .gitignore .gitignore | 1 - bucardo.spec | 10 ++++++++-- master-master-replication-example.txt | 16 ++++++++++++++++ sources | 2 +- 4 files changed, 25 insertions(+), 4 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