Fix conflict caused by previous commit.
authorTatsuo Ishii <ishii@postgresql.org>
Thu, 19 Dec 2013 02:26:36 +0000 (11:26 +0900)
committerTatsuo Ishii <ishii@postgresql.org>
Thu, 19 Dec 2013 02:26:36 +0000 (11:26 +0900)
commita764b6060f65d0c1255503b6c77b8b0fe7dab1af
treead093161d68b9908616fa1f6d3ecd524d7acf6e0
parent0538f3c80903843420b60d34e91f08fe034c9d74
Fix conflict caused by previous commit.
doc/pgpool-en.html