Merge branch 'master' of ssh://git.postgresql.org/press
authorJosh Berkus <josh@agliodbs.com>
Thu, 31 Dec 2015 19:58:55 +0000 (11:58 -0800)
committerJosh Berkus <josh@agliodbs.com>
Thu, 31 Dec 2015 19:58:55 +0000 (11:58 -0800)

Trivial merge