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

[Muhammad Usama]

Merge branch 'master' into EXCEPTION_MGR

Conflicts:
	doc/pgpool-en.html
	doc/pgpool-ja.html
	src/include/pool.h
	src/main/main.c
	src/protocol/child.c
	src/tools/pgmd5/Makefile.am

Branches
--------
EXCEPTION_MGR
master

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

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