Merge branch 'master' into slot2 slot2
authorRobert Haas <rhaas@postgresql.org>
Sat, 1 Feb 2014 03:25:01 +0000 (22:25 -0500)
committerRobert Haas <rhaas@postgresql.org>
Sat, 1 Feb 2014 03:25:01 +0000 (22:25 -0500)
commitc7de3295ba9db6649c32568bb46b91f1160da8d3
tree52bda214aaf8fa4bcc80eb8593c06807f2dc776d
parente01fc2377bfdb6a519aea7007a57c901c8a95da6
parentd1981719adbcc05fa15f540e8fc4327907991fc6
Merge branch 'master' into slot2
doc/src/sgml/catalogs.sgml
doc/src/sgml/func.sgml
src/backend/storage/lmgr/proc.c