History | View | Annotate | Download (249 Bytes)
Merge remote branch 'canopg/master'
Conflicts: .gitignore etc/findpgsql.sh
ignore editor backups
Merge branch 'credil' of git+ssh://code.credil.org/git/credil-redmine into mcr_1.0
Conflicts: .gitignore
Ignore editor poops in gitignore.
add scripts to create local cluster for testing purposes