Merge branch 'master' of ssh://git.postgresql.org/press
authorJosh Berkus <josh@agliodbs.com>
Wed, 6 Jan 2016 18:37:05 +0000 (10:37 -0800)
committerJosh Berkus <josh@agliodbs.com>
Wed, 6 Jan 2016 18:37:05 +0000 (10:37 -0800)

Trivial merge