[pgpool-committers: 1884] pgpool: Merge branch 'master' into EXCEPTION_MGR

[Muhammad Usama]

Merge branch 'master' into EXCEPTION_MGR

Conflicts:
	src/config/pool_config.c
	src/libs/pcp/Makefile.am
	src/libs/pcp/Makefile.in
	src/libs/pcp/pcp.c
	src/main/main.c
	src/protocol/child.c
	src/protocol/pool_process_query.c
	src/utils/pcp/pcp_stream.c

Branches
--------
EXCEPTION_MGR
master

Details
-------
http://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=24aaeb6ec00669b78a82f03a24e12336961ca305

Modified Files
--------------