Merge branch 'master' of ssh://git.postgresql.org/press
authorStéphane Schildknecht <stephane.schildknecht@postgresqlfr.org>
Wed, 6 Jan 2016 10:23:06 +0000 (11:23 +0100)
committerStéphane Schildknecht <stephane.schildknecht@postgresqlfr.org>
Wed, 6 Jan 2016 10:23:06 +0000 (11:23 +0100)

Trivial merge