Merge branch 'master' of github.com:cbbrowne/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 25 Sep 2013 16:56:48 +0000 (12:56 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Wed, 25 Sep 2013 16:56:48 +0000 (12:56 -0400)

Trivial merge