Merge branch 'master' into feature/watchdog Conflicts: doc/wd-ja.html Branch ------ feature/watchdog Details ------- http://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=e12db64deb20d30577012227dc8c20ebdd722240 Modified Files --------------