Merge branch 'master' of ssh://git.postgresql.org/press
authorJosh Berkus <josh@agliodbs.com>
Sat, 8 Sep 2012 20:55:14 +0000 (13:55 -0700)
committerJosh Berkus <josh@agliodbs.com>
Sat, 8 Sep 2012 20:55:14 +0000 (13:55 -0700)

Trivial merge