Merge branch 'master' into EXCEPTION_MGR Conflicts: src/auth/pool_auth.c src/main/main.c Branch ------ EXCEPTION_MGR Details ------- http://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=711b00a8ff7d861350e3d65cbe8f4120654f2b4d Modified Files --------------