Merge branch 'master' of ssh://git.postgresql.org/press
authorStéphane Schildknecht <stephane.schildknecht@postgresqlfr.org>
Mon, 4 Jan 2016 18:48:52 +0000 (19:48 +0100)
committerStéphane Schildknecht <stephane.schildknecht@postgresqlfr.org>
Mon, 4 Jan 2016 18:48:52 +0000 (19:48 +0100)

Trivial merge