[pgpool-committers: 380] pgpool: Merge ssh://git.postgresql.org/pgpool2 into /feature/watchdog

[at.mitani]

Merge ssh://git.postgresql.org/pgpool2 into /feature/watchdog

Conflicts:
	configure
	pool_config.c
	pool_memqcache.c
	pool_proto_modules.c

Branches
--------
feature/watchdog
master

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

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