Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 11 May 2012 22:31:37 +0000 (18:31 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 11 May 2012 22:31:37 +0000 (18:31 -0400)

Trivial merge