19ec8f6
Merge branch 'master' into el6 Conflicts: .gitignore bucardo.spec master-master-replication-example.txt sources