Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 5 Mar 2014 21:48:05 +0000 (16:48 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 5 Mar 2014 21:48:05 +0000 (16:48 -0500)

Trivial merge