Merge branch 'master' of ssh://git.postgresql.org/press
authorJosh Berkus <josh@pgexperts.com>
Wed, 14 Aug 2013 01:28:50 +0000 (18:28 -0700)
committerJosh Berkus <josh@pgexperts.com>
Wed, 14 Aug 2013 01:28:50 +0000 (18:28 -0700)

Trivial merge