From: Robert Haas <rhaas@postgresql.org>
Date: Sat, 1 Feb 2014 03:25:01 +0000 (-0500)
Subject: Merge branch 'master' into slot2
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fslot2;p=users%2Frhaas%2Fpostgres.git

Merge branch 'master' into slot2
---

c7de3295ba9db6649c32568bb46b91f1160da8d3