Merge branch 'master' of ssh://git.postgresql.org/pgopen2018-test into testing
authorSarah Conway <sarah.conway@crunchydata.com>
Mon, 16 Jul 2018 13:00:06 +0000 (06:00 -0700)
committerSarah Conway <sarah.conway@crunchydata.com>
Mon, 16 Jul 2018 13:00:06 +0000 (06:00 -0700)

Trivial merge