Merge branch 'master' of ssh://git.postgresql.org/press
authorStéphane Schildknecht <sas@postgresql.fr>
Tue, 4 Sep 2012 18:01:28 +0000 (20:01 +0200)
committerStéphane Schildknecht <sas@postgresql.fr>
Tue, 4 Sep 2012 18:01:28 +0000 (20:01 +0200)

Trivial merge