[tomcat-native] 01/03: Merge tag 'upstream/1.1.31'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository tomcat-native.

commit 0620c1e5557b0717611bbca35bef182ca95c41f7
Merge: 3da4af2 499484f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 30 00:33:26 2014 +0200

    Merge tag 'upstream/1.1.31'
    
    Upstream version 1.1.31

 CHANGELOG.txt                           |  335 +--
 jni/build.properties.default            |    5 +-
 jni/build.xml                           |    2 +-
 jni/docs/images/docs-stylesheet.css     |    4 +
 jni/docs/index.html                     |    4 +-
 jni/docs/miscellaneous/changelog.html   |   19 +
 jni/docs/news/2014.html                 |    8 +-
 jni/java/org/apache/tomcat/jni/SSL.java |   15 +-
 jni/jnirelease.sh                       |    2 +-
 jni/native/build/._apr_common.m4        |  Bin 0 -> 177 bytes
 jni/native/build/._config.guess         |  Bin 0 -> 177 bytes
 jni/native/build/._config.sub           |  Bin 0 -> 177 bytes
 jni/native/build/._find_apr.m4          |  Bin 0 -> 177 bytes
 jni/native/build/._install.sh           |  Bin 0 -> 177 bytes
 jni/native/build/config.guess           |  306 +-
 jni/native/build/config.sub             |   21 +-
 jni/native/configure                    | 4902 +++++++++++++++++--------------
 jni/native/include/tcn_version.h        |    4 +-
 jni/native/os/win32/libtcnative.rc      |    6 +-
 jni/native/src/network.c                |    5 +-
 jni/native/src/ssl.c                    |   36 +-
 jni/native/srclib/VERSIONS              |    2 +-
 jni/native/tcnative.spec                |    2 +-
 jni/xdocs/images/docs-stylesheet.css    |    4 +
 jni/xdocs/index.xml                     |    4 +-
 jni/xdocs/miscellaneous/changelog.xml   |   20 +
 jni/xdocs/news/2014.xml                 |    8 +-
 27 files changed, 3192 insertions(+), 2522 deletions(-)

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