Change test to return 255 rather than -1, as per the change in commit
ef8c0ab6d26510bd61a24718c0a763911043aec5
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Fix tagging
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
COPY protocol makes some slon.conf parameters obsolete, so they should be dropped from regression test suite
Ran pgindent against the codebase:

 pgindent /var/lib/postgresql/postgresql/src/tools/pgindent/typedefs.list  src/*/*.{c,h}
Fixing documentation error (The clone finish page
used 'clone prepare' in the synopsis)
Fixing syntax error in the example.
We use 'cluster name' not 'clustername'.
Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
Fix for bug 265. PostgreSQL 8.3 does not support the
array[]::text[] syntax for creating an empty text array.
All PG versions from 8.3 to 9.1 however do support
the syntax '{}'::text[] for doing the same.
Jeff Frost contributed a sample Upstart script; added this to the
shared configuration directory, along with a section in the admin
scripts page on documentation.
Add in FAQ entry listing various ways to start slon
Merge branch 'master' of ssh://git.postgresql.org/slony1-engine into bug265
Remerging bug 248.

This was partially unmerged as part of the COPY protocol commits

Stop tracking the sequence name on log shipping targets.
Instead include the sequence name in the log shipping files on
sequence updates.  This avoids the issue of us not adding
new tracking table entries on an enable subscription.

Add an OMIT COPY option to the script to allow
a log shipping target to be upgraded to a new slony version
without reloading all the data.  During an outage you
would drop the $clustername schema from the target
then run slony1_dump.sh with -omit_copy to reinit
the node.
Additional remerges for bug 248
Bug 268
Postgresql 9.2 (and later) has changed procpid to be pid in pg_stat_activity.
Use the newer column name when connected to a new pgsql
Fix compile errors/warnings when compiling against pg 9.2