[libpostgresql-jdbc-java] 102/128: Merge branch 'master' of github.com:pgjdbc/pgjdbc

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag REL9_3_1100
in repository libpostgresql-jdbc-java.

commit 364c7659c27defc38e9a90b5ee5c8d726b7b9b30
Merge: 479861e 9e07f61
Author: Dave Cramer <davecramer at gmail.com>
Date:   Tue Sep 3 06:43:45 2013 -0400

    Merge branch 'master' of github.com:pgjdbc/pgjdbc

 build.xml                                          |   4 +-
 org/postgresql/Driver.java.in                      |   4 +-
 org/postgresql/core/v2/ConnectionFactoryImpl.java  |   2 +-
 org/postgresql/core/v2/QueryExecutorImpl.java      |   8 +-
 org/postgresql/core/v3/ConnectionFactoryImpl.java  |   2 +-
 org/postgresql/core/v3/QueryExecutorImpl.java      |  12 +-
 .../jdbc2/AbstractJdbc2DatabaseMetaData.java       |   4 +-
 org/postgresql/jdbc2/AbstractJdbc2Statement.java   |  12 +-
 org/postgresql/jdbc2/TypeInfoCache.java            |   3 +
 org/postgresql/test/TestUtil.java                  |  45 +++
 org/postgresql/test/extensions/HStoreTest.java     |   4 +
 org/postgresql/test/jdbc3/Jdbc3TestSuite.java      |   1 +
 .../test/jdbc3/StringTypeParameterTest.java        | 143 ++++++++
 org/postgresql/test/xa/XADataSourceTest.java       |  29 +-
 org/postgresql/translation/bg.po                   |  14 +-
 org/postgresql/translation/cs.po                   | 262 +++++++-------
 org/postgresql/translation/de.po                   | 276 +++++++-------
 org/postgresql/translation/es.po                   |   6 +-
 org/postgresql/translation/fr.po                   | 398 ++++++++++-----------
 org/postgresql/translation/it.po                   | 340 +++++++++---------
 org/postgresql/translation/ja.po                   |   6 +-
 org/postgresql/translation/nl.po                   |   6 +-
 org/postgresql/translation/pl.po                   |   6 +-
 org/postgresql/translation/pt_BR.po                |   6 +-
 org/postgresql/translation/ru.po                   |   6 +-
 org/postgresql/translation/sr.po                   |   6 +-
 org/postgresql/translation/tr.po                   |   6 +-
 org/postgresql/translation/zh_CN.po                |   6 +-
 org/postgresql/translation/zh_TW.po                |   6 +-
 org/postgresql/util/PSQLState.java                 |   1 +
 org/postgresql/xa/PGXAConnection.java              |   4 +
 31 files changed, 931 insertions(+), 697 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git