Merge branch 'master' into slot2
authorRobert Haas <rhaas@postgresql.org>
Fri, 31 Jan 2014 12:52:24 +0000 (07:52 -0500)
committerRobert Haas <rhaas@postgresql.org>
Fri, 31 Jan 2014 12:52:24 +0000 (07:52 -0500)
1  2 
doc/src/sgml/func.sgml
src/include/catalog/pg_proc.h

Simple merge
Simple merge