Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 4 May 2011 22:10:08 +0000 (18:10 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 4 May 2011 22:10:08 +0000 (18:10 -0400)

Trivial merge