[pgpool-committers: 1963] pgpool: Merge branch 'EXCEPTION_MGR' of ssh://git.postgresql.org/pgpool

[Muhammad Usama]

Merge branch 'EXCEPTION_MGR' of ssh://git.postgresql.org/pgpool2 into EXCEPTION_MGR

Conflicts:
	src/auth/pool_auth.c
	src/config/pool_config.c
	src/context/pool_query_context.c
	src/libs/pcp/Makefile.am
	src/libs/pcp/Makefile.in
	src/libs/pcp/pcp.c
	src/main/main.c
	src/main/pgpool_main.c
	src/protocol/child.c
	src/protocol/pool_proto_modules.c
	src/tools/pgmd5/Makefile.am

Branches
--------
EXCEPTION_MGR
master

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

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