Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 30 Nov 2015 16:32:47 +0000 (11:32 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 30 Nov 2015 16:32:47 +0000 (11:32 -0500)

Trivial merge