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)
1  2 
doc/src/sgml/catalogs.sgml
doc/src/sgml/func.sgml
src/backend/storage/lmgr/proc.c

Simple merge
Simple merge
Simple merge