[Pkg-xmpp-commits] [jabberd2] 02/11: Merge tag 'upstream/2.6.0'

[Simon Josefsson]

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

jas pushed a commit to branch master
in repository jabberd2.

commit 26bd7820370ab3e0f81daea43962d5127bb08258
Merge: f894f8b 239d16a
Author: Simon Josefsson <simon at josefsson.org>
Date:   Sun Jul 9 08:29:27 2017 +0200

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0
    
    # gpg: Signature made sön  9 jul 2017 08:29:26 CEST
    # gpg:                using RSA key 99415CE1905D0E55A9F88026860B7FBB32F8119D
    # gpg: Good signature from "Simon Josefsson <simon at josefsson.org>" [ultimate]
    # gpg:                 aka "Simon Josefsson <simon at yubico.com>" [ultimate]

 NEWS         |  8 ++++++++
 configure.ac |  2 +-
 sx/sasl.c    | 59 +++++++++++++++++++++++++++++++++++++++--------------------
 sx/sasl.h    |  5 ++++-
 4 files changed, 52 insertions(+), 22 deletions(-)

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