Merge branch 'master' of git://git.postgresql.org/git/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 28 Jan 2013 22:51:24 +0000 (17:51 -0500)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 28 Jan 2013 22:51:24 +0000 (17:51 -0500)

Trivial merge