[libpostgresql-jdbc-java] 02/128: Merge remote-tracking branch 'origin'

[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 df00ad0ab37f51778015514be23daf425fa87156
Merge: b106d6b bddc05f
Author: Dave Cramer <davec at Daves-MacBook-Air.local>
Date:   Mon Jun 4 13:24:21 2012 -0400

    Merge remote-tracking branch 'origin'

 doc/pgjdbc.xml                                     |  24 ++--
 org/postgresql/Driver.java.in                      | 158 +++++++--------------
 org/postgresql/core/ConnectionFactory.java         |   7 +-
 org/postgresql/core/PGStream.java                  |  23 ++-
 org/postgresql/core/ProtocolConnection.java        |  11 +-
 org/postgresql/core/v2/ConnectionFactoryImpl.java  |  39 +++--
 org/postgresql/core/v2/ProtocolConnectionImpl.java |  14 +-
 org/postgresql/core/v3/ConnectionFactoryImpl.java  |  31 +++-
 org/postgresql/core/v3/ProtocolConnectionImpl.java |  15 +-
 org/postgresql/jdbc2/AbstractJdbc2Connection.java  |   6 +-
 org/postgresql/jdbc3/AbstractJdbc3Connection.java  |   5 +-
 .../jdbc3g/AbstractJdbc3gConnection.java           |   5 +-
 org/postgresql/jdbc4/AbstractJdbc4Connection.java  |   5 +-
 org/postgresql/jdbc4/AbstractJdbc4Statement.java   |   9 +-
 org/postgresql/jdbc4/Jdbc4Connection.java          |   5 +-
 org/postgresql/ssl/jdbc3/AbstractJdbc3MakeSSL.java |   3 +-
 org/postgresql/ssl/jdbc4/AbstractJdbc4MakeSSL.java |  11 +-
 org/postgresql/test/jdbc2/DriverTest.java          |  42 +++++-
 18 files changed, 222 insertions(+), 191 deletions(-)

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