From: Robert Haas <rhaas@postgresql.org>
Date: Thu, 30 Jan 2014 17:31:25 +0000 (-0500)
Subject: Merge branch 'master' into slot2
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=c268f862c963ff398aba0a8074b02c258a5635b9;p=users%2Frhaas%2Fpostgres.git

Merge branch 'master' into slot2
---

c268f862c963ff398aba0a8074b02c258a5635b9