[mina2] 08/09: Merge tag 'upstream/2.0.13'

[Emmanuel Bourg]

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

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

commit 54f4a1e1fa1b1dfd67f097ba80345a6b96b691f1
Merge: 6c696fe 4876abe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 3 22:56:04 2016 +0200

    Merge tag 'upstream/2.0.13'
    
    Upstream version 2.0.13

 NOTICE-bin.txt                                     |  2 +-
 NOTICE.txt                                         |  2 +-
 src/NOTICE-bin.txt                                 |  2 +-
 src/mina-core/META-INF/MANIFEST.MF                 | 90 +++++++++++-----------
 src/mina-core/pom.xml                              |  2 +-
 .../org/apache/mina/filter/ssl/SslHandler.java     | 43 +++++++----
 src/mina-example/pom.xml                           |  2 +-
 .../example/echoserver/EchoProtocolHandler.java    |  4 +-
 src/mina-filter-compression/META-INF/MANIFEST.MF   | 14 ++--
 src/mina-filter-compression/pom.xml                |  2 +-
 src/mina-http/META-INF/MANIFEST.MF                 | 14 ++--
 src/mina-http/pom.xml                              |  2 +-
 src/mina-integration-beans/META-INF/MANIFEST.MF    |  8 +-
 src/mina-integration-beans/pom.xml                 |  2 +-
 src/mina-integration-jmx/META-INF/MANIFEST.MF      | 12 +--
 src/mina-integration-jmx/pom.xml                   |  2 +-
 src/mina-integration-ognl/META-INF/MANIFEST.MF     | 12 +--
 src/mina-integration-ognl/pom.xml                  |  2 +-
 src/mina-integration-xbean/pom.xml                 |  2 +-
 src/mina-legal/pom.xml                             |  2 +-
 src/mina-statemachine/META-INF/MANIFEST.MF         | 24 +++---
 src/mina-statemachine/pom.xml                      |  2 +-
 src/mina-transport-apr/META-INF/MANIFEST.MF        | 18 ++---
 src/mina-transport-apr/pom.xml                     |  2 +-
 src/mina-transport-serial/META-INF/MANIFEST.MF     | 18 ++---
 src/mina-transport-serial/pom.xml                  |  2 +-
 src/pom.xml                                        |  4 +-
 27 files changed, 150 insertions(+), 141 deletions(-)

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