Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 23 Dec 2011 18:01:02 +0000 (13:01 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 23 Dec 2011 18:01:02 +0000 (13:01 -0500)

Trivial merge