Merge branch 'master' into slot2

author Robert Haas <[email protected]>

Wed, 29 Jan 2014 22:07:48 +0000 (17:07 -0500)

committer Robert Haas <[email protected]>

Wed, 29 Jan 2014 22:07:48 +0000 (17:07 -0500)
author Robert Haas <[email protected]>
Wed, 29 Jan 2014 22:07:48 +0000 (17:07 -0500)
committer Robert Haas <[email protected]>
Wed, 29 Jan 2014 22:07:48 +0000 (17:07 -0500)
diff --cc doc/src/sgml/config.sgml
Simple merge
diff --cc doc/src/sgml/func.sgml
Simple merge
diff --cc src/include/catalog/pg_proc.h
Simple merge
author	Robert Haas <[email protected]>
	Wed, 29 Jan 2014 22:07:48 +0000 (17:07 -0500)
committer	Robert Haas <[email protected]>
	Wed, 29 Jan 2014 22:07:48 +0000 (17:07 -0500)
		1	2
doc/src/sgml/config.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/func.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/catalog/pg_proc.h	patch \|	diff1 \|	diff2 \|	blob \| history