Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 1 Apr 2013 15:59:21 +0000 (11:59 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 1 Apr 2013 15:59:21 +0000 (11:59 -0400)

Trivial merge