Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Thu, 21 Mar 2013 20:38:52 +0000 (16:38 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Thu, 21 Mar 2013 20:38:52 +0000 (16:38 -0400)

Trivial merge