Merge branch 'master' of ssh://git.postgresql.org/press
authorStéphane Schildknecht <sas@postgresql.fr>
Mon, 10 Sep 2012 13:38:28 +0000 (15:38 +0200)
committerStéphane Schildknecht <sas@postgresql.fr>
Mon, 10 Sep 2012 13:38:28 +0000 (15:38 +0200)

Trivial merge